move from support/1.0.27 to feature/1.0.27

1 files changed, 10 insertions, 14 deletions

diff --git a/backend/snapscan-sources.c b/backend/snapscan-sources.c
index 63eadb2..dc78394 100644
--- a/backend/snapscan-sources.c
+++ b/backend/snapscan-sources.c
@@ -105,10 +105,6 @@ I hope this makes sense to you (and I got the right idea of the original author'
 intention).
 ***********************************************************************************/
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ "(undef)"
-#endif
-
 static SANE_Status Source_init (Source *pself,
                                 SnapScan_Scanner *pss,
                                 SourceRemaining remaining,
@@ -266,13 +262,13 @@ static SANE_Status FDSource_get (Source *pself, SANE_Byte *pbuf, SANE_Int *plen)
             }
             /* It's an IO error */
             DBG (DL_MAJOR_ERROR, "%s: read failed: %s\n",
-                     __FUNCTION__, strerror(errno));
+                     __func__, strerror(errno));
             status = SANE_STATUS_IO_ERROR;
         }
         else if (bytes_read == 0)
         {
             /* EOF of current reading */
-            DBG(DL_DATA_TRACE, "%s: EOF\n",__FUNCTION__);
+            DBG(DL_DATA_TRACE, "%s: EOF\n",__func__);
             break;
         }
         ps->bytes_remaining -= bytes_read;
@@ -623,7 +619,7 @@ static SANE_Status Expander_init (Expander *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: couldn't allocate channel buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -654,7 +650,7 @@ static SANE_Status create_Expander (SnapScan_Scanner *pss,
     {
         DBG (DL_MAJOR_ERROR,
              "%s: failed to allocate Expander.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -871,7 +867,7 @@ static SANE_Status Deinterlacer_init (Deinterlacer *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: couldn't allocate channel buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -901,7 +897,7 @@ static SANE_Status create_Deinterlacer (SnapScan_Scanner *pss,
     {
         DBG (DL_MAJOR_ERROR,
              "%s: failed to allocate Deinterlacer.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1106,7 +1102,7 @@ static SANE_Status RGBRouter_init (RGBRouter *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: failed to allocate circular buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -1141,7 +1137,7 @@ static SANE_Status create_RGBRouter (SnapScan_Scanner *pss,
     if (*pps == NULL)
     {
         DBG (DL_MAJOR_ERROR, "%s: failed to allocate RGBRouter.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1193,7 +1189,7 @@ static SANE_Status create_Inverter (SnapScan_Scanner *pss,
     if (*pps == NULL)
     {
         DBG (DL_MAJOR_ERROR, "%s: failed to allocate Inverter.\n",
-                 __FUNCTION__);
+                 __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1256,7 +1252,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
             break;
         default:
             DBG (DL_MAJOR_ERROR, "%s: bad mode value %d (internal error)\n",
-                 __FUNCTION__, mode);
+                 __func__, mode);
             status = SANE_STATUS_INVAL;
             break;
         }