Changeset 9523

Timestamp:

Oct 12, 2006, 1:43:58 PM (20 years ago)

Author:

magnier

Message:

psMetadata *md argument of psMetadataIteratorAlloc should be const; removed garbage code used to handle non-const md

Location:

trunk/psLib/src

Files:

• types/psMetadata.c (modified) (5 diffs)
• types/psMetadata.h (modified) (2 diffs)
• xml/psXML.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.136 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-07 03:55:24 $
+ *  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-12 23:43:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -418 +418 @@
                            const psMetadata *in)
 {
-    // in == NULL is a valid input, return 'out' as is
+
     if (in == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true, "psMetadataCopy: 'in' cannot be NULL");
@@ -433 +433 @@
         out = psMetadataAlloc();
     }
-    psMetadataIterator *iter = psMetadataIteratorAlloc(*(psMetadata**)&in, PS_LIST_HEAD, NULL);
+    psMetadataIterator *iter = psMetadataIteratorAlloc(in, PS_LIST_HEAD, NULL);
     psMetadataItem *inItem = NULL;
     while ((inItem = psMetadataGetAndIncrement(iter))) {
@@ -958 +958 @@
 }
 
-psMetadataIterator* psMetadataIteratorAlloc(psMetadata* md,
+// XXX should md be const?
+psMetadataIterator* psMetadataIteratorAlloc(const psMetadata* md,
         long location,
         const char* regex)
@@ -1214 +1215 @@
     }
     // Casting away const --- the addition of an iterator should not be considered an invasion of "const".
-    psMetadataIterator *iter = psMetadataIteratorAlloc((psMetadata*)md, PS_LIST_HEAD, NULL); // Iterator
+    psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item = NULL; // Item from metadata
     while ( (item = psMetadataGetAndIncrement(iter)) ) {

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-09-10 08:53:07 $
+*  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-12 23:43:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -975 +975 @@
  */
 psMetadataIterator* psMetadataIteratorAlloc(
-    psMetadata* md,                    ///< the psMetadata to iterate with
-    long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    const psMetadata* md,  ///< the psMetadata to iterate with
+    long location,   ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     const char* regex
     ///< A regular expression for subsetting the psMetadata.  If NULL, no

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @author David Robbins, MHPCC
 *
-*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-26 04:34:28 $
+*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-12 23:43:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
     char timeVal[MAXSTR];
     int i;
-    psMetadataIterator *iter = psMetadataIteratorAlloc(*(psMetadata**)&md, PS_LIST_HEAD, NULL);
+    psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
     psMetadataItem *item;