Changeset 8627 for trunk/psLib/src/types

Timestamp:

Aug 25, 2006, 6:34:28 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to:

psAbort()
psErrorStackPrint()
p_psError()
p_psWarning()
psLogMsg()
p_psTrace()

add PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL
add PS_ASSERT_S64_WITHIN_RANGE
fix PS_ASSERT_LONG_WITHIN_RANGE
fix a wide range of format related issues:

• missing format field specifiers
• missing format args
• incorrect format field specifiers
• constants declared with the wrong type (float vs. int)
• PS_ASSERT* for the wrong type
• attemps to print structs with *printf()
• unportable format specifiers, eg. long vs. long long

Location:

trunk/psLib/src/types

Files:

• psArguments.c (modified) (2 diffs)
• psArray.c (modified) (2 diffs)
• psBitSet.c (modified) (5 diffs)
• psHash.c (modified) (4 diffs)
• psList.c (modified) (4 diffs)
• psLookupTable.c (modified) (5 diffs)
• psMetadata.c (modified) (5 diffs)
• psMetadataConfig.c (modified) (4 diffs)
• psMetadataItemCompare.c (modified) (1 diff)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -304 +304 @@
         case PS_DATA_STRING:
             if (item->data.V) {
-                printf("""%s""", (char*)(item->data.V));
+                printf("""%s""", item->data.str);
             }
             break;

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 05:26:19 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -215 +215 @@
         if (position >= array->nalloc) {
             psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                    _("Specified position, %d, is greater than the allocated size of the array, %d."),
+                    _("Specified position, %ld, is greater than the allocated size of the array, %ld."),
                     position, array->nalloc);
             return false;

trunk/psLib/src/types/psBitSet.c

@@ -11 +11 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82 +82 @@
     if (nalloc < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The number of bit in a psBitSet (%d) must be greater than zero."),
+                _("The number of bit in a psBitSet (%ld) must be greater than zero."),
                 nalloc);
         return NULL;
@@ -113 +113 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
-                bit,bitSet->n * 8 - 1);
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
+                bit, bitSet->n * 8 - 1);
         return bitSet;
     }
@@ -136 +136 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
-                bit,bitSet->n * 8 - 1);
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
+                bit, bitSet->n * 8 - 1);
         return bitSet;
     }
@@ -159 +159 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
                 bit,bitSet->n * 8 - 1);
         return false;

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-09 02:26:44 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include <stdio.h>
 #include <string.h>
+#include <inttypes.h>
+
 #include "psHash.h"
 #include "psMemory.h"
@@ -148 +150 @@
     table->n = nalloc;
 
-    psTrace("psLib.types", 1, "Creating %d-element hash table\n", nalloc);
+    psTrace("psLib.types", 1, "Creating %ld-element hash table\n", nalloc);
 
     // Initialize all buckets to NULL.
@@ -260 +262 @@
     if ((hash < 0) || (hash >= table->n)) {
         psError(PS_ERR_UNKNOWN, true,
-                "Internal hash function out of range (%d)", hash);
+                "Internal hash function out of range (%" PRId64 ")", hash);
     }
     // ptr will have the correct hash bucket.

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -206 +206 @@
     if (location < 0 || location >= (int)list->n) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified location, %d, is invalid."),
+                _("Specified location, %ld, is invalid."),
                 location);
         return false;
@@ -260 +260 @@
     if (location > 0 && location >= (int)list->n) {
         psLogMsg(__func__,PS_LOG_WARN,
-                 "Specified location, %d, is beyond the end of the list.  "
+                 "Specified location, %ld, is beyond the end of the list.  "
                  "Adding data item to tail.",
                  location);
@@ -485 +485 @@
     if (! psListIteratorSet(iterator,location)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified location, %d, is invalid."),
+                _("Specified location, %ld, is invalid."),
                 location);
         return NULL;

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-23 01:56:15 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -20 +20 @@
 #include <limits.h>
 #include <math.h>
+#include <inttypes.h>
 
 #include "psMemory.h"
@@ -593 +594 @@
 
     if (indexCol >= vectors->n) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %d, is larger than number of columns, %d.",
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %ld, is larger than number of columns, %ld.",
                 indexCol, vectors->n);
         return NULL;
@@ -814 +815 @@
         if(hiIdx >= numRows) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("High index too big, %d."), hiIdx);
+                    _("High index too big, %" PRIu64 "."), hiIdx);
             return NAN;
         }
@@ -824 +825 @@
     if(loIdx < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Low index too small, %d."), loIdx);
+                _("Low index too small, %" PRIu64 "."), loIdx);
         return NAN;
     }

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 22:10:35 $
+ *  @version $Revision: 1.129 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -733 +733 @@
         if (entry == NULL) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Could not find metadata item at index %d."), where);
+                    _("Could not find metadata item at index %ld."), where);
             return false;
         }
@@ -740 +740 @@
         if (key == NULL) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Failed to remove metadata item, at index %d, from metadata list."),
+                    _("Failed to remove metadata item, at index %ld, from metadata list."),
                     where);
             return false;
@@ -959 +959 @@
         }
         if (!psMetadataIteratorSet(newIter, location)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to set location=%d for metadata iterator.\n", location);
+            psError(PS_ERR_UNKNOWN, false, "Unable to set location=%ld for metadata iterator.\n", location);
             psFree(newIter);
             return NULL;
@@ -1229 +1229 @@
         switch (item->type) {
         case PS_DATA_STRING:
-            fprintf(fd, "%s\n", (char*)(item->data.V));
+            fprintf(fd, "%s\n", item->data.str);
             break;
         case PS_DATA_BOOL:

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-26 00:32:39 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -539 +539 @@
     case 's':
         if (type == PS_DATA_STRING) {
-            fprintf(fd,format,(char*)item->data.V);
+            fprintf(fd,format, item->data.str);
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE,true,
@@ -1010 +1010 @@
         break;
     default:
-        psError(PS_ERR_IO,true,_("Metadata type '%s', found on line %u of %s, is invalid."),
+        psError(PS_ERR_IO,true,_("Metadata of unknown type found on line %u of %s."),
                 lineCount,fileName);
         break;
@@ -1346 +1346 @@
     case PS_DATA_STRING:
         psStringAppend(&content, "%-15s  %-8s", item->name, "STR");
-        psStringAppend(&content, "  %s", ((char *)(item->data.V)));
+        psStringAppend(&content, "  %s", item->data.str);
         if ( strncmp(item->comment,"",2) ) {
             psStringAppend(&content, " #%s", item->comment);

trunk/psLib/src/types/psMetadataItemCompare.c

@@ -67 +67 @@
             return false;
         }
-        psTrace("psLib.types", 10, "Comparing '%s' with '%s'\n", compare->data.V, template->
-                data.V);
+        psTrace("psLib.types", 10, "Comparing '%s' with '%s'\n",
+                compare->data.str, template->
+                data.str);
         return (strcasecmp(compare->data.V, template->
                            data.V) == 0) ? true : false;