Changeset 23688 for trunk/ippTools/src/faketool.c

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/faketool.c (modified) (6 diffs)

trunk/ippTools/src/faketool.c

@@ -496 +496 @@
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args,        "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args,        "-fault", false, false);
 
     if (!psDBTransaction(config->dbh)) {
@@ -513 +513 @@
                                    path_base,
                                    "full",
-                                   code,
+                                   fault,
                                    NULL         // epoch
             )) {
@@ -687 +687 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -693 +693 @@
     PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
 
-    if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", where, code)) {
+    if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", where, fault)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
         psFree(where);
@@ -1238 +1238 @@
 
   int numExportTables = 2;
-  
+
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
@@ -1316 +1316 @@
 
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  
+
   PXOPT_LOOKUP_STR(infile, config->args, "-infile", true,  false);