Changeset 8591

Timestamp:

Aug 24, 2006, 7:26:19 PM (20 years ago)

Author:

drobbin

Message:

added checks to psArray Alloc fxns for negative nalloc inputs. Added tap testing for most of psArray. Finishing Set/Get. Updated test for metadata polynomials but most remains undone.

Location:

trunk/psLib

Files:

• src/types/psArray.c (modified) (4 diffs)
• src/types/psMetadata.c (modified) (3 diffs)
• test/types/Makefile.am (modified) (2 diffs)
• test/types/tap_psArray_all.c (added)
• test/types/tap_psMetadata_creating.c (modified) (1 diff)
• test/types/tap_psMetadata_polynomials.c (added)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-25 05:26:19 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 static void arrayFree(psArray* psArr)
 {
-    if (psArr == NULL) {
-        return;
-    }
-
     psArrayElementsFree(psArr);
 
@@ -60 +56 @@
 psArray* psArrayAlloc(long nalloc)
 {
+    if (nalloc < 0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "Can't allocate a psArray of negative size.");
+        return NULL;
+    }
     psArray* psArr = NULL;
 
@@ -78 +79 @@
                         long nalloc)
 {
+    if (nalloc < 0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "Can't reallocate a psArray to negative size.");
+        return in;
+    }
     if (in == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL,true,_("psArrayRealloc must be given a non-NULL psArray to resize."));
+        psError(PS_ERR_BAD_PARAMETER_NULL,true,
+                _("psArrayRealloc must be given a non-NULL psArray to resize."));
         return NULL;
     } else if (in->nalloc != nalloc) {     // No need to realloc to same size

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-24 03:17:03 $
+ *  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-25 05:26:19 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1417 +1417 @@
 
 // XXX : these may need F64, or %g format for output
-bool psPolynomial2DtoMD (psMetadata *md, psPolynomial2D *poly, char *format, ...)
+bool psPolynomial2DtoMD (psMetadata *md,
+                         psPolynomial2D *poly,
+                         char *format,
+                         ...)
 {
 
@@ -1451 +1454 @@
             if (poly->mask[nx][ny])
                 continue;
-            psMetadataAdd (folder, PS_LIST_TAIL, "VAL_X%02d_Y%02d", PS_DATA_F64, "polynomial coefficient", poly->coeff[nx][ny], nx, ny);
-            psMetadataAdd (folder, PS_LIST_TAIL, "ERR_X%02d_Y%02d", PS_DATA_F64, "polynomial coefficient error", poly->coeffErr[nx][ny], nx, ny);
+            psMetadataAdd (folder, PS_LIST_TAIL, "VAL_X%02d_Y%02d", PS_DATA_F64,
+                           "polynomial coefficient", poly->coeff[nx][ny], nx, ny);
+            psMetadataAdd (folder, PS_LIST_TAIL, "ERR_X%02d_Y%02d", PS_DATA_F64,
+                           "polynomial coefficient error", poly->coeffErr[nx][ny], nx, ny);
         }
     }

trunk/psLib/test/types/Makefile.am

@@ -35 +35 @@
         tap_psMetadata_copying \
         tap_psMetadata_creating \
-        tap_psMetadata_manip
+        tap_psMetadata_manip   \
+        tap_psMetadata_polynomials \
+        tap_psArray_all
 
 
@@ -85 +87 @@
 tap_psMetadata_manip_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
 tap_psMetadata_manip_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
+
+tap_psMetadata_polynomials_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
+tap_psMetadata_polynomials_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
+
+tap_psArray_all_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
+tap_psArray_all_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
 
 check_DATA = \

trunk/psLib/test/types/tap_psMetadata_creating.c

@@ -265 +265 @@
     psMetadata *md = NULL;
     //Attempt to free a null metadata
-    psMetadata *dummy = psMetadataAlloc();
-    md = dummy;
-    dummy = NULL;
-    psFree(dummy);
-    psFree(md);
     md = psMetadataAlloc();
     psMetadata *md1 = psMetadataAlloc();