Changeset 3286 for trunk/psLib/src/collections

Timestamp:

Feb 18, 2005, 12:17:20 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src/collections

Files:

• psArray.c (modified) (2 diffs)
• psHash.c (modified) (1 diff)
• psMetadata.c (modified) (4 diffs)

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-18 22:17:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -103 +103 @@
 
     // add the element to the end of the array.
-    psArr->data[n] = data;
+    psArr->data[n] = psMemIncrRefCounter(data);
     psArr->n = n+1;
 

trunk/psLib/src/collections/psHash.c

@@ -12 +12 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 19:26:23 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-18 22:17:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 19:26:23 $
+*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-18 22:17:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -344 +344 @@
     }
     // Decrement reference count, since the metadata item is now in metadata collection and no longer needed
-    psMemDecrRefCounter(metadataItem);
+    psFree(metadataItem);
 
     return true;
@@ -453 +453 @@
 { \
     psMetadataItem *metadataItem = NULL; \
+    ps##TYPE value = 0; \
     \
     if (status) { \
@@ -469 +470 @@
         switch (metadataItem->pType) { \
         case PS_TYPE_S32: \
-            return metadataItem->data.S32; \
+            value = (ps##TYPE)metadataItem->data.S32; \
+            break; \
         case PS_TYPE_F32: \
-            return metadataItem->data.F32; \
+            value = (ps##TYPE)metadataItem->data.F32; \
+            break; \
         case PS_TYPE_F64: \
-            return metadataItem->data.F64; \
+            value = (ps##TYPE)metadataItem->data.F64; \
+            break; \
         case PS_TYPE_BOOL: \
             if (metadataItem->data.B) { \
-                return 1; \
+                value = 1; \
             } \
-            return 0; \
+            break; \
         default: \
+            /* if you get to this point, the value is not a number. */ \
+            if (status) { \
+                *status = false; \
+            } \
             break; \
+        } \
+    } else { \
+        if (status) { \
+            *status = false; \
         } \
     } \
     \
-    /* if you get to this point, the value is not a number. */ \
-    if (status) { \
-        *status = false; \
-    } \
-    \
-    return 0; \
+    /* psFree(metadataItem); currently, the lookup doesn't increment the ref count */ \
+    return value; \
 }