Changeset 8187

Timestamp:

Aug 4, 2006, 5:05:37 PM (20 years ago)

Author:

jhoblitt

Message:

add -pending -simple
fix a memory leak in -pending

Location:

trunk/ippTools/src

Files:

• pxframes.c (modified) (2 diffs)
• regtool.c (modified) (1 diff)
• regtoolConfig.c (modified) (1 diff)

trunk/ippTools/src/pxframes.c

@@ -51 +51 @@
     PS_ASSERT_PTR_NON_NULL(frames, false); \
 \
-    psMetadata *output = psMetadataAlloc(); \
+    bool simple = false; \
+    { \
+        bool status = false; \
+        simple = psMetadataLookupBool(&status, config->args, "-simple"); \
+        if (!status) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple"); \
+            return false; \
+        } \
+    } \
 \
     for (long i = 0; i < psArrayLength(frames); i++) { \
@@ -58 +66 @@
         PS_ASSERT_PTR_NON_NULL(frame->images, false); \
 \
-        for (long j = 0; j < psArrayLength(frame->images); j++) { \
-            imfiletype##Row *image = frame->images->data[j]; \
-            psMetadata *md = imfiletype##MetadataFromObject(image); \
-            psMetadataAddMetadata(output, PS_LIST_TAIL, #imfiletype,  PS_META_DUPLICATE_OK, NULL, md); \
-            psFree(md); \
+        if (!imfiletype##PrintObjects(stdout, frame->images, !simple)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to print array"); \
+            return false; \
         } \
     } \
-\
-    psString str = psMetadataConfigFormat(output); \
-    psFree(output); \
-    fprintf(stream, "%s\n", str); \
-    psFree(str); \
+    \
 \
     return true; \

trunk/ippTools/src/regtool.c

@@ -65 +65 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, false,"newFramePrint() failed");
+        psFree(new);
         return false;
     }

trunk/ippTools/src/regtoolConfig.c

@@ -34 +34 @@
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-class",  0,
         "define class", NULL);
+    psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple",  0,
+        "use the simple output format", false);