Changeset 7911

Timestamp:

Jul 14, 2006, 4:37:47 PM (20 years ago)

Author:

Paul Price

Message:

Fixes for psMetadataIterator with a regex. See bugs 777, 778.

File:

• trunk/psLib/src/types/psMetadata.c (modified) (5 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.116 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-15 02:37:47 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -127 +127 @@
     if (iter->regex != NULL) {
         regfree(iter->regex);
+        psFree(iter->regex);
     }
 }
@@ -918 +919 @@
     psMemSetDeallocator(newIter, (psFreeFunc) metadataIteratorFree);
 
-    if (regex == NULL) {
-        newIter->iter = psListIteratorAlloc(md->list, location, false);
-        return newIter;
-    } else {
+    newIter->iter = psListIteratorAlloc(md->list, location, false);
+
+    if (regex) {
+        newIter->regex = psAlloc(sizeof(regex_t));
         int regRtn = regcomp(newIter->regex,regex,0);
         if (regRtn != 0) {
@@ -934 +935 @@
         }
     }
-
-    psMetadataIteratorSet(newIter, location); // XXX: do we error if no match is found?
 
     return newIter;
@@ -1011 +1010 @@
     while (psListGetAndIncrement(iter) != NULL) {
         if (iter->cursor != NULL &&
-                regexec(regex, ((psMetadataItem*)iter->cursor)->name, 0, NULL, 0) == 0) {
+                regexec(regex, ((psMetadataItem*)iter->cursor->data)->name, 0, NULL, 0) == 0) {
             // this key is a match
             break;