Changeset 8610 for trunk/psLib/src/types

Timestamp:

Aug 25, 2006, 2:32:39 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to psStringAppend(), psStringPrepend(), p_psDBRunQuery(), & p_psDBRunQueryPrepared()
fix all of the format params errors found by the new attributes

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (8 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-17 15:39:24 $
+*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 00:32:39 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include <ctype.h>
 #include <limits.h>
+#include <inttypes.h>
 
 #include "psAbort.h"
@@ -57 +58 @@
 /** Maximum size of a string */
 #define MAX_STRING_LENGTH 1024
-#define MAXSTR 2256
 
 
@@ -1279 +1279 @@
     #define FORMAT_PRIMITIVE_METADATAITEM(type, dataformat) \
     psStringAppend(&content, "%-15s  %-8s", item->name, #type); \
-    psStringAppend(&content, "  " #dataformat, item->data.type); \
+    psStringAppend(&content, "  " dataformat, item->data.type); \
     if ( strncmp(item->comment,"",2) ) { \
         psStringAppend(&content, " #%s\n", item->comment); \
@@ -1315 +1315 @@
         break;
     case PS_DATA_S8:
-        FORMAT_PRIMITIVE_METADATAITEM(S8, %d);
+        FORMAT_PRIMITIVE_METADATAITEM(S8, "%d");
         break;
     case PS_DATA_S16:
-        FORMAT_PRIMITIVE_METADATAITEM(S16, %d);
+        FORMAT_PRIMITIVE_METADATAITEM(S16, "%d");
         break;
     case PS_DATA_S32:
-        FORMAT_PRIMITIVE_METADATAITEM(S32, %d);
+        FORMAT_PRIMITIVE_METADATAITEM(S32, "%d");
         break;
     case PS_DATA_S64:
-        FORMAT_PRIMITIVE_METADATAITEM(S32, %ld);
+        FORMAT_PRIMITIVE_METADATAITEM(S64, "%"PRId64);
         break;
     case PS_DATA_U8:
-        FORMAT_PRIMITIVE_METADATAITEM(U8, %u);
+        FORMAT_PRIMITIVE_METADATAITEM(U8, "%u");
         break;
     case PS_DATA_U16:
-        FORMAT_PRIMITIVE_METADATAITEM(U16, %u);
+        FORMAT_PRIMITIVE_METADATAITEM(U16, "%u");
         break;
     case PS_DATA_U32:
-        FORMAT_PRIMITIVE_METADATAITEM(U32, %u);
+        FORMAT_PRIMITIVE_METADATAITEM(U32, "%u");
         break;
     case PS_DATA_U64:
-        FORMAT_PRIMITIVE_METADATAITEM(U64, %lu);
+        FORMAT_PRIMITIVE_METADATAITEM(U64, "%"PRIu64);
         break;
     case PS_DATA_F32:
-        FORMAT_PRIMITIVE_METADATAITEM(F32, %.7g);
+        FORMAT_PRIMITIVE_METADATAITEM(F32, "%.7g");
         break;
     case PS_DATA_F64:
-        FORMAT_PRIMITIVE_METADATAITEM(F64, %.15g);
+        FORMAT_PRIMITIVE_METADATAITEM(F64, "%.15g");
         break;
     case PS_DATA_STRING:
@@ -1425 +1425 @@
             psStringAppend(&content, "U64 ");
             for (int i = 0; i < vector->n; i++) {
-                psStringAppend(&content, "%lu ", vector->data.U64[i]);
+                psStringAppend(&content, "%" PRIu64 " ", vector->data.U64[i]);
             }
             break;
@@ -1449 +1449 @@
             psStringAppend(&content, "S64 ");
             for (int i = 0; i < vector->n; i++) {
-                psStringAppend(&content, "%ld ", vector->data.S64[i]);
+                psStringAppend(&content, "%" PRId64 " ", vector->data.S64[i]);
             }
             break;
         case PS_DATA_F32:
-            psStringAppend(&content, "F32 ", MAXSTR);
+            psStringAppend(&content, "F32 ");
             for (int i = 0; i < vector->n; i++) {
                 psStringAppend(&content, "%.7g ", vector->data.F32[i]);
@@ -1459 +1459 @@
             break;
         case PS_DATA_F64:
-            psStringAppend(&content, "F64 ", MAXSTR);
+            psStringAppend(&content, "F64 ");
             for (int i = 0; i < vector->n; i++) {
                 psStringAppend(&content, "%.15g", vector->data.F64[i]);