Changeset 8669 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Aug 29, 2006, 11:39:44 AM (20 years ago)

Author:

jhoblitt

Message:

fix a wide range of format string errors

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -243 +243 @@
             file->camera = pmConfigCameraByName(config, words->data[0]);
             if (!file->camera) {
-                psError(PS_ERR_IO, false, "camera %s not found\n", words->data[0]);
+                psError(PS_ERR_IO, false, "camera %s not found\n", (char *)words->data[0]);
                 psFree(words);
                 return NULL;
@@ -305 +305 @@
     }
     if (infiles->n < 1) {
-        psError(PS_ERR_IO, false, "Found n == %d files in %s in arguments\n", infiles->n, argname);
+        psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname);
         return NULL;
     }
@@ -318 +318 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -326 +326 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }
@@ -433 +433 @@
     }
     if (infiles->n <= entry) {
-        psError(PS_ERR_IO, false, "only %d files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
+        psError(PS_ERR_IO, false, "only %ld files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
         return NULL;
     }
@@ -448 +448 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -456 +456 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }