Changeset 4457 for trunk/psLib/src/collections/psMetadata.c

Timestamp:

Jul 5, 2005, 5:04:35 PM (21 years ago)

Author:

drobbin

Message:

made changes based on revisions in psLib SDRS rev. 15

File:

• trunk/psLib/src/collections/psMetadata.c (modified) (19 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-27 20:38:12 $
+*  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-06 03:04:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
     psFree(iter->iter);
 
-    if (iter->preg != NULL) {
-        regfree(iter->preg);
+    if (iter->regex != NULL) {
+        regfree(iter->regex);
     }
 }
@@ -268 +268 @@
 }
 
-bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, psS32 location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, long location, psS32 flags)
 {
     char * key = NULL;
@@ -360 +360 @@
 }
 
-bool psMetadataAdd(psMetadata *md, int location, const char *name,
+bool psMetadataAdd(psMetadata *md, long location, const char *name,
                    int format, const char *comment, ...)
 {
@@ -372 +372 @@
 }
 
-bool psMetadataAddV(psMetadata *md, int location, const char *name,
+bool psMetadataAddV(psMetadata *md, long location, const char *name,
                     int format, const char *comment, va_list list)
 {
@@ -391 +391 @@
 
 #define METADATA_ADD_TYPE(NAME,TYPE,METATYPE) \
-psBool psMetadataAdd##NAME(psMetadata* md, psS32 where, const char* name, \
+psBool psMetadataAdd##NAME(psMetadata* md, long where, const char* name, \
                            const char* comment, TYPE value) { \
     return psMetadataAdd(md,where,name, METATYPE,comment,value); \
@@ -409 +409 @@
 METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY)
 
-psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key)
+psBool psMetadataRemove(psMetadata *md, long where, const char *key)
 {
     PS_ASSERT_PTR_NON_NULL(md,NULL);
@@ -580 +580 @@
 psMetadataLookupNumTYPE(Bool)
 
-psMetadataItem* psMetadataGet(const psMetadata *md, int location)
+psMetadataItem* psMetadataGet(const psMetadata *md, long location)
 {
     psMetadataItem* entry = NULL;
@@ -597 +597 @@
 
 psMetadataIterator* psMetadataIteratorAlloc(psMetadata* md,
-        int location,
+        long location,
         const char* regex)
 {
@@ -604 +604 @@
 
     psMetadataIterator* newIter = psAlloc(sizeof(psMetadataIterator));
-    newIter->preg = NULL;
+    newIter->regex = NULL;
     newIter->iter = NULL;
 
@@ -614 +614 @@
         return newIter;
     } else {
-        int regRtn = regcomp(newIter->preg,regex,0);
+        int regRtn = regcomp(newIter->regex,regex,0);
         if (regRtn != 0) {
             char errMsg[256];
-            regerror(regRtn, newIter->preg, errMsg, 256);
-            regfree(newIter->preg);
+            regerror(regRtn, newIter->regex, errMsg, 256);
+            regfree(newIter->regex);
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                     PS_ERRORTEXT_psMetadata_REGEX_INVALID,
@@ -633 +633 @@
 
 bool psMetadataIteratorSet(psMetadataIterator* iterator,
-                           int location)
+                           long location)
 {
     int match;
@@ -643 +643 @@
     PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
-    regex_t* preg = iterator->preg;
+    regex_t* regex = iterator->regex;
 
     // handle trivial case where no regex subsetting is required.
-    if (preg == NULL) {
+    if (regex == NULL) {
         return psListIteratorSet(iter,location);
     }
@@ -655 +655 @@
         psListIteratorSet(iter,PS_LIST_TAIL);
         while ( (cursor=(psMetadataItem*)iter->cursor) != NULL) {
-            if (regexec(preg, cursor->name, 0, NULL, 0) == 0) {
+            if (regexec(regex, cursor->name, 0, NULL, 0) == 0) {
                 // this key is a match
                 match--;
@@ -671 +671 @@
     psListIteratorSet(iter,PS_LIST_HEAD);
     while ( (cursor=(psMetadataItem*)iter->cursor) != NULL) {
-        if (regexec(preg, cursor->name, 0, NULL, 0) == 0) {
+        if (regexec(regex, cursor->name, 0, NULL, 0) == 0) {
             // this key is a match
             match++;
@@ -692 +692 @@
     PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
-    regex_t* preg = iterator->preg;
+    regex_t* regex = iterator->regex;
 
     // handle trivial case where no regex subsetting is required.
-    if (preg == NULL) {
+    if (regex == NULL) {
         return (psMetadataItem*)psListGetAndIncrement(iter);
     }
@@ -703 +703 @@
     while (psListGetAndIncrement(iter) != NULL) {
         if (iter->cursor != NULL &&
-                regexec(preg, ((psMetadataItem*)iter->cursor)->name, 0, NULL, 0) == 0) {
+                regexec(regex, ((psMetadataItem*)iter->cursor)->name, 0, NULL, 0) == 0) {
             // this key is a match
             break;
@@ -720 +720 @@
     PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
-    regex_t* preg = iterator->preg;
+    regex_t* regex = iterator->regex;
 
     // handle trivial case where no regex subsetting is required.
-    if (preg == NULL) {
+    if (regex == NULL) {
         return (psMetadataItem*)psListGetAndDecrement(iter);
     }
@@ -731 +731 @@
     while (psListGetAndDecrement(iter) != NULL) {
         if (iter->cursor != NULL &&
-                regexec(preg, ((psMetadataItem*)iter->cursor)->name, 0, NULL, 0) == 0) {
+                regexec(regex, ((psMetadataItem*)iter->cursor)->name, 0, NULL, 0) == 0) {
             // this key is a match
             break;