Changeset 18076 for branches/cleanup/ippTools/src/regtool.c

Timestamp:

Jun 10, 2008, 4:02:14 PM (18 years ago)

Author:

jhoblitt

Message:

MERGE from HEAD

Location:

branches/cleanup/ippTools/src

Files:

• . (modified) (1 prop)
• regtool.c (modified) (3 diffs)

branches/cleanup/ippTools/src

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect

branches/cleanup/ippTools/src/regtool.c

@@ -280 +280 @@
         object,
         hostname,
-        code
+        code,
+        NULL
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -630 +631 @@
     psMetadata *row = output->data[0];
     // convert metadata into a newExp object
+    psMetadataConfigPrint(stdout, row);
     newExpRow *newExp = newExpObjectFromMetadata(row);
     psFree(output);
+    if (!newExp) {
+        psError(PS_ERR_UNKNOWN, false, "this should not happen");
+        return false;
+    }
 
     // carry through these values
@@ -700 +706 @@
         0.0,
         hostname,
-        code
+        code,
+        NULL
     )) {
         // rollback

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect