Changeset 8257

Timestamp:

Aug 9, 2006, 4:22:15 PM (20 years ago)

Author:

drobbin

Message:

edited psMetadataItemParse and tap test.

Location:

trunk/psLib

Files:

• src/types/psMetadataItemParse.c (modified) (2 diffs)
• test/types/Makefile.am (modified) (2 diffs)

trunk/psLib/src/types/psMetadataItemParse.c

@@ -255 +255 @@
                                   )
 {
-    PS_ASSERT_PTR_NON_NULL(item, psStringCopy(""));
+    PS_ASSERT_PTR_NON_NULL(item, NULL);
 
     switch (item->type) {
@@ -271 +271 @@
 
     default:
-        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Item %s (%s) is not of string type (%x) --- treating as "
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "Item %s (%s) is not of string type (%x) --- treating as "
                 "undefined.\n", item->name, item->comment, item->type);
-        return psStringCopy("");
-    }
-}
-
+        //        return psStringCopy("");
+        return NULL;
+    }
+}
+

trunk/psLib/test/types/Makefile.am

@@ -30 +30 @@
         tap_psListIterator \
         tap_psMetadataConfigParse \
-        tap_psMetadataItemCompare
+        tap_psMetadataItemCompare \
+        tap_psMetadataItemParse
 
 
@@ -65 +66 @@
 tap_psMetadataItemCompare_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
 tap_psMetadataItemCompare_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
+
+tap_psMetadataItemParse_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
+tap_psMetadataItemParse_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
 
 check_DATA = \