Changeset 4401 for trunk/psLib/src/xml

Timestamp:

Jun 27, 2005, 10:38:12 AM (21 years ago)

Author:

drobbin

Message:

made required changes based on apidelta-report-cycle6

Location:

trunk/psLib/src/xml

Files:

• psXML.c (modified) (7 diffs)
• psXML.h (modified) (3 diffs)

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 02:02:05 $
+*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-27 20:38:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -363 +363 @@
 }
 
-bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem)
+bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item)
 {
     psMetadataType type;
@@ -370 +370 @@
     PS_ASSERT_PTR_NON_NULL(fd, success);
     PS_ASSERT_PTR_NON_NULL(format, success);
-    PS_ASSERT_PTR_NON_NULL(metadataItem, success);
-
-    type = metadataItem->type;
+    PS_ASSERT_PTR_NON_NULL(item, success);
+
+    type = item->type;
 
     // determining the format type
@@ -391 +391 @@
         switch(type) { \
         case PS_META_BOOL: \
-            fprintf(fd, format, (FORMAT_TYPE) metadataItem->data.B); \
+            fprintf(fd, format, (FORMAT_TYPE) item->data.B); \
             break; \
         case PS_META_S32: \
-            fprintf(fd,format,(FORMAT_TYPE)  metadataItem->data.S32); \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.S32); \
             break; \
         case PS_META_F32: \
-            fprintf(fd, format,(FORMAT_TYPE)  metadataItem->data.F32); \
+            fprintf(fd, format,(FORMAT_TYPE)  item->data.F32); \
             break; \
         case PS_META_F64: \
-            fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F64); \
+            fprintf(fd, format,(FORMAT_TYPE) item->data.F64); \
             break; \
         default: \
@@ -433 +433 @@
     case 's':
         if (type == PS_META_STR) {
-            fprintf(fd,format,(char*)metadataItem->data.V);
+            fprintf(fd,format,(char*)item->data.V);
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE,true,
@@ -441 +441 @@
         break;
     case 'p':
-        fprintf(fd,format,metadataItem->data.V);
+        fprintf(fd,format,item->data.V);
         break;
     default:
@@ -1075 +1075 @@
 }
 
-psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite)
 {
     FILE*               fp                   = NULL;

trunk/psLib/src/xml/psXML.h

@@ -10 +10 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-14 02:54:07 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-27 20:38:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
     FILE * fd,                         ///< Pointer to file to write metadata item.
     const char *format,                ///< Format to print metadata item.
-    const psMetadataItem* metadataItem ///< Metadata item to print.
+    const psMetadataItem* item         ///< Metadata item to print.
 );
 
@@ -81 +81 @@
 psMetadata* psMetadataConfigParse(
     psMetadata* md,                    ///< Resulting metadata from read.
-    psU32 *nFail,                      ///< Number of failed lines.
+    int *nFail,                        ///< Number of failed lines.
     const char *fileName,              ///< Name of file to read.
-    psBool overwrite                   ///< Allow overwrite of duplicate specifications.
+    bool overwrite                     ///< Allow overwrite of duplicate specifications.
 );