Changeset 8374

Timestamp:

Aug 15, 2006, 5:28:13 PM (20 years ago)

Author:

drobbin

Message:

removed error check for NULL vector in MetaItemCopy

Location:

trunk/psLib

Files:

• src/mathtypes/psVector.c (modified) (2 diffs)
• src/pstap.h (modified) (1 diff)
• src/types/psMetadata.c (modified) (3 diffs)
• test/types/Makefile.am (modified) (2 diffs)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-08 23:32:23 $
+*  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-16 03:28:13 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -329 +329 @@
                     typeStr);
             psFree(output);
-
+            output = NULL;
             break;
         }

trunk/psLib/src/pstap.h

@@ -5 +5 @@
 return exit_status()
 
+       #define mem() ok(psMemCheckLeaks(0, NULL, stdout, false) == 0, "Memory Leaks")
+
+       #define checkLeaks false
+
+       #define checkMem() if(checkLeaks) mem()

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-14 20:05:05 $
+ *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-16 03:28:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -384 +384 @@
         PS_METADATA_ITEM_COPY_CASE(STRING,V); // This will copy the string, not point at it.
     case PS_DATA_VECTOR: {
+            PS_ASSERT_PTR_NON_NULL(in->data.V, NULL);
             psVector *vecCopy = psVectorCopy(NULL, (psVector*)(in->data.V),
                                              ((psVector*)(in->data.V))->type.type);
-            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
-            }
+            //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;
         }
@@ -455 +458 @@
             psErrorStackPrint(stderr, "Error copying %s (%s) in the metadata\n", inItem->name,
                               inItem->comment);
+            printf("\nok we're here\n");
         }
         psFree(newItem);                // Drop reference

trunk/psLib/test/types/Makefile.am

@@ -32 +32 @@
         tap_psMetadataItemCompare \
         tap_psMetadataItemParse \
-        tap_psMetadata_printing
+        tap_psMetadata_printing \
+        tap_psMetadata_copying
 
 
@@ -73 +74 @@
 tap_psMetadata_printing_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
 tap_psMetadata_printing_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
+
+tap_psMetadata_copying_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
+tap_psMetadata_copying_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
 
 check_DATA = \