Remove conditionally-compiled or unreachable debug C code

src/_imaging.c

@@ -165,10 +165,6 @@ PyImagingNew(Imaging imOut) {
         return NULL;
     }
 
-#ifdef VERBOSE
-    printf("imaging %p allocated\n", imagep);
-#endif
-
     imagep->image = imOut;
     imagep->access = ImagingAccessNew(imOut);
 
@@ -177,10 +173,6 @@ PyImagingNew(Imaging imOut) {
 
 static void
 _dealloc(ImagingObject *imagep) {
-#ifdef VERBOSE
-    printf("imaging %p deleted\n", imagep);
-#endif
-
     if (imagep->access) {
         ImagingAccessDelete(imagep->image, imagep->access);
     }

src/_webp.c

@@ -675,7 +675,6 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
         WebPData exif = {exif_bytes, i_exif_size};
         WebPData xmp = {xmp_bytes, i_xmp_size};
         WebPMuxError err;
-        int dbg = 0;
 
         int copy_data = 0;  // value 1 indicates given data WILL be copied to the mux
                             // and value 0 indicates data will NOT be copied.
@@ -687,41 +686,21 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
         }
         WebPMuxSetImage(mux, &image, copy_data);
 
-        if (dbg) {
-            /* was getting %ld icc_size == 0, icc_size>0 was true */
-            fprintf(stderr, "icc size %d, %d \n", i_icc_size, i_icc_size > 0);
-        }
-
         if (i_icc_size > 0) {
-            if (dbg) {
-                fprintf(stderr, "Adding ICC Profile\n");
-            }
             err = WebPMuxSetChunk(mux, "ICCP", &icc_profile, copy_data);
             if (err != WEBP_MUX_OK) {
                 return HandleMuxError(err, "ICCP");
             }
         }
 
-        if (dbg) {
-            fprintf(stderr, "exif size %d \n", i_exif_size);
-        }
         if (i_exif_size > 0) {
-            if (dbg) {
-                fprintf(stderr, "Adding Exif Data\n");
-            }
             err = WebPMuxSetChunk(mux, "EXIF", &exif, copy_data);
             if (err != WEBP_MUX_OK) {
                 return HandleMuxError(err, "EXIF");
             }
         }
 
-        if (dbg) {
-            fprintf(stderr, "xmp size %d \n", i_xmp_size);
-        }
         if (i_xmp_size > 0) {
-            if (dbg) {
-                fprintf(stderr, "Adding XMP Data\n");
-            }
             err = WebPMuxSetChunk(mux, "XMP ", &xmp, copy_data);
             if (err != WEBP_MUX_OK) {
                 return HandleMuxError(err, "XMP ");

src/decode.c

@@ -522,8 +522,6 @@ PyImaging_LibTiffDecoderNew(PyObject *self, PyObject *args) {
     const ModeID mode = findModeID(mode_name);
     const RawModeID rawmode = findRawModeID(rawmode_name);
 
-    TRACE(("new tiff decoder %s\n", compname));
-
     decoder = PyImaging_DecoderNew(sizeof(TIFFSTATE));
     if (decoder == NULL) {
         return NULL;

src/encode.c

@@ -718,7 +718,6 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
         return NULL;
     } else {
         tags_size = PyList_Size(tags);
-        TRACE(("tags size: %d\n", (int)tags_size));
         for (pos = 0; pos < tags_size; pos++) {
             item = PyList_GetItemRef(tags, pos);
             if (item == NULL) {
@@ -739,8 +738,6 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
         return NULL;
     }
 
-    TRACE(("new tiff encoder %s fp: %d, filename: %s \n", compname, fp, filename));
-
     encoder = PyImaging_EncoderNew(sizeof(TIFFSTATE));
     if (encoder == NULL) {
         return NULL;
@@ -865,7 +862,6 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
             );
         } else if (is_var_length) {
             Py_ssize_t len, i;
-            TRACE(("Setting from Tuple: %d \n", key_int));
             len = PyTuple_Size(value);
 
             if (key_int == TIFFTAG_COLORMAP) {
@@ -1050,17 +1046,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 status = ImagingLibTiffSetField(
                     &encoder->state, (ttag_t)key_int, (uint64_t)PyLong_AsLongLong(value)
                 );
-            } else {
-                TRACE(
-                    ("Unhandled type for key %d : %s \n",
-                     key_int,
-                     PyBytes_AsString(PyObject_Str(value)))
-                );
             }
         }
         Py_DECREF(item);
         if (!status) {
-            TRACE(("Error setting Field\n"));
             Py_DECREF(encoder);
             PyErr_SetString(PyExc_RuntimeError, "Error setting from dictionary");
             return NULL;

src/libImaging/Mode.c

@@ -1,11 +1,6 @@
 #include "Mode.h"
 #include <string.h>
 
-#ifdef NDEBUG
-#include <stdio.h>
-#include <stdlib.h>
-#endif
-
 const ModeData MODES[] = {
     [IMAGING_MODE_UNKNOWN] = {""},
 
@@ -28,12 +23,7 @@ findModeID(const char *const name) {
         return IMAGING_MODE_UNKNOWN;
     }
     for (size_t i = 0; i < sizeof(MODES) / sizeof(*MODES); i++) {
-#ifdef NDEBUG
-        if (MODES[i].name == NULL) {
-            fprintf(stderr, "Mode ID %zu is not defined.\n", (size_t)i);
-        } else
-#endif
-            if (strcmp(MODES[i].name, name) == 0) {
+        if (strcmp(MODES[i].name, name) == 0) {
             return (ModeID)i;
         }
     }
@@ -230,12 +220,7 @@ findRawModeID(const char *const name) {
         return IMAGING_RAWMODE_UNKNOWN;
     }
     for (size_t i = 0; i < sizeof(RAWMODES) / sizeof(*RAWMODES); i++) {
-#ifdef NDEBUG
-        if (RAWMODES[i].name == NULL) {
-            fprintf(stderr, "Rawmode ID %zu is not defined.\n", (size_t)i);
-        } else
-#endif
-            if (strcmp(RAWMODES[i].name, name) == 0) {
+        if (strcmp(RAWMODES[i].name, name) == 0) {
             return (RawModeID)i;
         }
     }