Changeset 8684

Timestamp:

Aug 29, 2006, 1:20:21 PM (20 years ago)

Author:

jhoblitt

Message:

fix a wide range of format string errors

Location:

trunk/stac/src

Files:

• stacCheckMemory.c (modified) (3 diffs)
• stacRead.c (modified) (3 diffs)
• sum.c (modified) (1 diff)

trunk/stac/src/stacCheckMemory.c

@@ -10 +10 @@
 {
     psLogMsg("stac.memoryPrint", PS_LOG_INFO,
-             "Memory block %d:\n"
+             "Memory block %lu:\n"
              "\tFile %s, line %d, size %d\n"
-             "\tPosts: %x %x %x\n",
+             "\tPosts: %p %p %p\n",
              ptr->id, ptr->file, ptr->lineno, ptr->userMemorySize, ptr->startblock, ptr->endblock,
              *(void**)((int8_t *)(ptr + 1) + ptr->userMemorySize));
@@ -25 +25 @@
 {
     psLogMsg("stac.checkMemory.corruption", PS_LOG_WARN,
-             "Memory corruption detected in memBlock %d\n"
+             "Memory corruption detected in memBlock %lu\n"
              "\tFile %s, line %d, size %d\n"
-             "\tPosts: %x %x %x\n",
+             "\tPosts: %p %p %p\n",
              ptr->id, file, lineno, ptr->userMemorySize, ptr->startblock, ptr->endblock,
              (ptr + 1 + ptr->userMemorySize));
@@ -52 +52 @@
     for (int i = 0; i < nLeaks; i++) {
         psLogMsg("stac.checkMemory.leaks", PS_LOG_WARN,
-                 "Memory leak detection: memBlock %d\n"
+                 "Memory leak detection: memBlock %lu\n"
                  "\tFile %s, line %d, size %d\n",
                  leaks[i]->id, leaks[i]->file, leaks[i]->lineno, leaks[i]->userMemorySize);

trunk/stac/src/stacRead.c

@@ -27 +27 @@
         psFits *imageFile = psFitsOpen(filenames->data[i], "r");
         if (!imageFile) {
-            psError(PS_ERR_IO, false, "Unable to open FITS file %s.\n", filenames->data[i]);
+            psError(PS_ERR_IO, false, "Unable to open FITS file %s.\n", (char *)filenames->data[i]);
             exit(EXIT_FAILURE);
         }
@@ -36 +36 @@
         psImage *image = psFitsReadImage(imageFile, imageRegion, 0);
         if (image == NULL) {
-            psErrorStackPrint(stderr,"Fatal error: Unable to read %s\n",filenames->data[i]);
+            psErrorStackPrint(stderr,"Fatal error: Unable to read %s\n", (char *)filenames->data[i]);
             exit(EXIT_FAILURE);
         }
@@ -190 +190 @@
     for (int i = 0; i < nFiles; i++) {
         if (strlen(filenames->data[i]) > MAXCHAR - 4) {
-            psLogMsg("stac.read.maps",PS_LOG_ERROR,"Filename %s is too long.\n",filenames->data[i]);
+            psLogMsg("stac.read.maps",PS_LOG_ERROR,"Filename %s is too long.\n",(char *)filenames->data[i]);
             exit(EXIT_FAILURE);
         }

trunk/stac/src/sum.c

@@ -39 +39 @@
         } else if (image->numCols != numCols || image->numRows != numRows) {
             psError(PS_ERR_IO, true, "Input images have different dimensions.  %s is %dx%d, but should be "
-                    "%dx%d\n", inputNames->data[i], image->numCols, image->numRows, numCols, numRows);
+                    "%dx%d\n", (char *)inputNames->data[i], image->numCols, image->numRows, numCols, numRows);
             return EXIT_FAILURE;
         }