Changeset 8694 for trunk/psLib/src/types

Timestamp:

Aug 29, 2006, 2:54:51 PM (20 years ago)

Author:

drobbin

Message:

edited psMetadataCopy for errorhandling of out param. Edited tests for coverage. Added array to execute_tap.

File:

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

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.130 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-29 20:23:54 $
+ *  @version $Revision: 1.131 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-30 00:54:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -376 +376 @@
             psVector *vecCopy = psVectorCopy(NULL, (psVector*)(in->data.V),
                                              ((psVector*)(in->data.V))->type.type);
-            //Following condition was removed b/c it doesn't seem possible for a
-            //non-NULL vector to be returned for non-NULL input
-            //            if (vecCopy == NULL) {
-            //                psError(PS_ERR_BAD_PARAMETER_NULL, false,
-            //                        "Error copying vector.  Vector skipped.\n");
-            //            } else {
             newItem = psMetadataItemAlloc(in->name, PS_DATA_VECTOR, in->comment, vecCopy);
             psFree(vecCopy);    // Drop reference
-            //            }
             break;
         }
@@ -425 +418 @@
                            const psMetadata *in)
 {
-    PS_ASSERT_PTR_NON_NULL(in,NULL);
-    PS_ASSERT_PTR_NON_NULL(in->list,NULL);
+    //    PS_ASSERT_PTR_NON_NULL(in,NULL);
+    if (in == NULL) {
+        if (out != NULL) {
+            psFree(out);
+            out = NULL;
+        }
+        return out;
+    }
+    //    PS_ASSERT_PTR_NON_NULL(in->list,NULL);
+    if (in->list == NULL) {
+        if (out != NULL) {
+            psFree(out);
+            out = NULL;
+        }
+        return out;
+    }
+
     if (out ==  NULL) {
         out = psMetadataAlloc();
@@ -447 +455 @@
             psErrorStackPrint(stderr, "Error copying %s (%s) in the metadata\n", inItem->name,
                               inItem->comment);
+            psFree(newItem);
+            psFree(iter);
+            psFree(out);
+            out = NULL;
+            return out;
         }
         psFree(newItem);                // Drop reference