Changeset 34089 for trunk/psLib

Timestamp:

Jun 26, 2012, 11:47:13 AM (14 years ago)

Author:

eugene

Message:

changes to support pedantic gcc warnings; add configure option for debug-build and no-as-needed

Location:

trunk/psLib

Files:

• configure.ac (modified) (2 diffs)
• m4/ipp_stdopts.m4 (modified) (2 diffs)
• src/astro/psTime.c (modified) (2 diffs)
• src/fits/psFitsTable.c (modified) (2 diffs)
• src/imageops/psImageGeomManip.c (modified) (2 diffs)
• src/imageops/psImageInterpolate.c (modified) (5 diffs)
• src/imageops/psImageStructManip.c (modified) (1 diff)
• src/math/psMinimizePowell.c (modified) (2 diffs)
• src/mathtypes/psVector.c (modified) (1 diff)
• src/types/psLookupTable.c (modified) (2 diffs)
• src/types/psMetadata.c (modified) (1 diff)
• src/types/psMetadataConfig.c (modified) (1 diff)
• src/types/psMetadataItemCompare.c (modified) (2 diffs)
• test/tap/src/tap.c (modified) (3 diffs)

trunk/psLib/configure.ac

@@ -27 +27 @@
 AC_SUBST(PSLIB_LT_VERSION,$PSLIB_LT_VERSION)
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 dnl ------------------- PERL options ---------------------
@@ -473 +473 @@
 dnl ------- enable -Werror after all of the probes have run ---------
 IPP_STDOPTS
-
-CFLAGS="${CFLAGS} -Wall -Werror"
-dnl enable POSIX/XSI and C99 compliance
+IPP_STDCFLAGS
 CFLAGS="${CFLAGS=} -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L"
 

trunk/psLib/m4/ipp_stdopts.m4

@@ -1 +1 @@
 
+dnl IPP_STDCFLAGS must go *after* external probes (to avoid Werror confusing things)
 AC_DEFUN([IPP_STDCFLAGS],
 [
+    dnl this section currently overrides a user-defined CFLAGS
     AC_ARG_ENABLE(optimize,
       [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
@@ -12 +14 @@
       ]
     )
+    dnl this section accepts a user-defined CFLAGS, and sets CFLAGS to the empty string if not present
+    AC_ARG_ENABLE(debug-build,
+      [AS_HELP_STRING(--enable-debug-build,enable debug build: ie disable Werror)],
+      [AC_MSG_RESULT(debug build enabled)
+        if test x"${CFLAGS}" == x; then
+          CFLAGS="-Wall"
+        else
+          CFLAGS="${CFLAGS=} -Wall"
+        fi
+      ],
+      [AC_MSG_RESULT([compile optimization disabled])
+        if test x"${CFLAGS}" == x; then
+          CFLAGS="-Wall -Werror"
+        else
+          CFLAGS="${CFLAGS=} -Wall -Werror"
+        fi
+      ]
+    )
 ])
+
+dnl IPP_STDLDFLAGS must go *before* external probes (so linking is done with --no-as-needed if needed)
+AC_DEFUN([IPP_STDLDFLAGS],
+[
+    dnl this section accepts a user-defined LDFLAGS, and sets LDFLAGS to the empty string if not present
+    AC_ARG_ENABLE(no-as-needed, 
+      [AS_HELP_STRING(--enable-no-as-needed, prevent as-needed option sometimes supplied to gcc such as Ubuntu after 11.11)],
+      [AC_MSG_RESULT(no-as-needed passed to linker) 
+        if test x"${LDFLAGS}" == x; then
+          LDFLAGS="-Wl,--no-as-needed"
+        else
+          LDFLAGS="${LDFLAGS=} -Wl,--no-as-needed"
+        fi
+      ],
+      [AC_MSG_RESULT(as-needed linker flags accepted) 
+        if test x"${LDFLAGS}" == x; then
+          LDFLAGS=""
+        fi
+      ]
+    )
+])
+dnl
 
 AC_DEFUN([IPP_STDOPTS],

trunk/psLib/src/astro/psTime.c

@@ -223 +223 @@
 static bool timeInit(const char *fileName)
 {
-    psS32 numLines = 0;
     bool foundTable = false;
     char *tableDir = NULL;
@@ -390 +389 @@
         if (i < numTables) {
             table = psLookupTableAlloc(fullTableName, (const char*)tableFormat, tablesIndex->data.S32[i]);
-            numLines = psLookupTableRead(table);
+            psLookupTableRead(table);
         } else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,

trunk/psLib/src/fits/psFitsTable.c

@@ -511 +511 @@
                 colSpec *spec = psAlloc(sizeof(colSpec)); // Specification for this column
                 // BOOL type is not a valid vector type, so we translate it to U8
-                spec->type = colItem->type == PS_TYPE_BOOL ? PS_TYPE_U8 : colItem->type;
+                spec->type = colItem->type == PS_DATA_BOOL ? PS_DATA_U8 : colItem->type;
                 spec->size = size;
                 if (colItem->type == PS_DATA_VECTOR) {
@@ -526 +526 @@
                 }
                 if (colItem->type != spec->type &&
-                    colItem->type != PS_TYPE_BOOL && spec->type != PS_TYPE_U8) {
+                    colItem->type != PS_DATA_BOOL && spec->type != PS_DATA_U8) {
                     psWarning("Differing type found for column %s: %x vs %x --- using the first found.\n",
                               colSpecItem->name, colItem->type, spec->type);

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -580 +580 @@
     psS32 outRows;
     psS32 outCols;
-    psS32 elementSize;
     psElemType type;
 
@@ -594 +593 @@
     outCols = input->numCols;
     type = input->type.type;
-    elementSize = PSELEMTYPE_SIZEOF(type);
+    // XXX unused psS32 elementSize = PSELEMTYPE_SIZEOF(type);
     out = psImageRecycle(out, outCols, outRows, type);
 

trunk/psLib/src/imageops/psImageInterpolate.c

@@ -461 +461 @@
     }
 
+#define INTERPOLATE_CHECK() \
+    if (xMin < 0) { /* XXX warn or error? */ } \
+    if (yMin < 0) { /* XXX warn or error? */ } \
+    if (xMax >= image->numCols) { /* XXX warn or error? */ } \
+    if (yMax >= image->numRows) { /* XXX warn or error? */ } \
+
 // Determine the result of the interpolation after all the math has been done
 static psImageInterpolateStatus interpolateResult(const psImageInterpolation *interp,
@@ -523 +529 @@
     }
     INTERPOLATE_RANGE();
+    INTERPOLATE_CHECK();
 
     // Get the appropriate kernels
@@ -779 +786 @@
     }
     INTERPOLATE_RANGE();
+    INTERPOLATE_CHECK();
 
     // Get the appropriate kernels
@@ -989 +997 @@
     INTERPOLATE_SETUP(x, y);
     xExact = yExact = false;
+    if (xExact && yExact) { /* possible alternative */ }
 
     psF32 xKernel[size], yKernel[size]; // Interpolation kernels
@@ -1038 +1047 @@
     INTERPOLATE_SETUP(x, y);
     xExact = yExact = false;
+    if (xExact && yExact) { /* possible alternative */ }
 
     psF32 xKernel[size], yKernel[size]; // Interpolation kernels

trunk/psLib/src/imageops/psImageStructManip.c

@@ -212 +212 @@
     elementSize = PSELEMTYPE_SIZEOF(inDatatype);
 
+    if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementSize); }
+
     output = p_psImageRecycle(file, lineno, func, output, numCols, numRows, type);
     P_PSIMAGE_SET_COL0(output, input->col0);

trunk/psLib/src/math/psMinimizePowell.c

@@ -367 +367 @@
     psF32 c = 0.0;
     psF32 n = 0.0;
-    psF32 fa = 0.0;
-    psF32 fb = 0.0;
-    psF32 fc = 0.0;
     psF32 fn = 0.0;
     psF32 mul = 0.0;
@@ -415 +412 @@
         PS_VECTOR_ADD_MULTIPLE(params, paramMask, line, tmpb, b);
         PS_VECTOR_ADD_MULTIPLE(params, paramMask, line, tmpc, c);
-        fa = func(tmpa, coords);
-        fb = func(tmpb, coords);
-        fc = func(tmpc, coords);
+        psF32 fb = func(tmpb, coords);
+# if (PS_TRACE_ON)
+        psF32 fa = func(tmpa, coords);
+        psF32 fc = func(tmpc, coords);
         psTrace("psLib.math", 6, "LineMin: f(%f %f %f) is (%f %f %f)\n", a, b, c, fa, fb, fc);
+# endif
 
         // We determine which is the biggest segment in [a,b,c] then split

trunk/psLib/src/mathtypes/psVector.c

@@ -322 +322 @@
             PSVECTOR_COPY_SAME_CASE(F32);
             PSVECTOR_COPY_SAME_CASE(F64);
-        default: {
-                char* typeStr;
-                PS_TYPE_NAME(typeStr,type);
-                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        //                        _("Input psVector is an unsupported type (0x%x)."), typeStr);
-                        "Input psVector is an unsupported type.\n");
-                psFree(output);
-                return NULL;
-            }
+          default: {
+              psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Input psVector is an unsupported type.\n");
+              psFree(output);
+              return NULL;
+          }
         }
         return output;

trunk/psLib/src/types/psLookupTable.c

@@ -607 +607 @@
     psU64 loIdx = 0;
     long  numRows = 0;
-    long numCols = 0;
     psF64 out = 0.0;
     psF64 denom = 0.0;
@@ -619 +618 @@
     values = table->values;
     numRows = table->index->n;
-    numCols = table->values->n;
     valuesVec = (psVector*)values->data[column];
 

trunk/psLib/src/types/psMetadata.c

@@ -1504 +1504 @@
               fprintf(fd, "\n");
               break;
-            case PS_DATA_UNKNOWN:
             default:
               fprintf(fd, "<Unsupported type>\n");

trunk/psLib/src/types/psMetadataConfig.c

@@ -1573 +1573 @@
             }
             break;
-        case PS_DATA_UNKNOWN:
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,

trunk/psLib/src/types/psMetadataItemCompare.c

@@ -129 +129 @@
   case PS_TYPE_##COMPARETYPENAME: { \
       TEMPLATETYPE valueC = (TEMPLATETYPE)compare->data.COMPARENAME; \
-      TEMPLATETYPE valueT = (TEMPLATETYPE)template->data.TEMPLATENAME; \
-      /* XXX check the validiy of the type casting? */ \
-      if (valueC != compare->data.COMPARENAME) { \
-          return false; \
-      } \
-      COMPARE_VALUES(valueT, valueC, (template->type == PS_TYPE_F32 || template->type == PS_TYPE_F64)); \
+      TEMPLATETYPE valueT = (TEMPLATETYPE)template->data.TEMPLATENAME;  \
+      /* XXX check the validiy of the type casting? */                  \
+      if (valueC != compare->data.COMPARENAME) {                        \
+        return false;                                                   \
+      }                                                                 \
+      COMPARE_VALUES(valueT, valueC, (template->type == PS_DATA_F32 || template->type == PS_DATA_F64)); \
+      /* COMPARE_VALUES(valueT, valueC, 1);                             */  \
       psAbort("Should never reach here."); \
   }
@@ -277 +278 @@
                     return false;
                 }
-                double compareValue = compare->type == PS_TYPE_F32 ? compare->data.F32 : compare->data.F64;
+                double compareValue = compare->type == PS_DATA_F32 ? compare->data.F32 : compare->data.F64;
                 COMPARE_VALUES(templateValue, compareValue, true);
             }

trunk/psLib/test/tap/src/tap.c

@@ -87 +87 @@
     if(test_name != NULL) {
         va_start(ap, test_name);
-        vasprintf(&local_test_name, test_name, ap);
+        int status = vasprintf(&local_test_name, test_name, ap);
+        if (status) {/* warning? */}
         va_end(ap);
 
@@ -303 +304 @@
 
     va_start(ap, fmt);
-    asprintf(&skip_msg, fmt, ap);
+    int status = asprintf(&skip_msg, fmt, ap);
+    if (status) {/* warning? */}
     va_end(ap);
 
@@ -328 +330 @@
 
     va_start(ap, fmt);
-    vasprintf(&todo_msg, fmt, ap);
+    int status = vasprintf(&todo_msg, fmt, ap);
+    if (status) {/* warning? */}
     va_end(ap);