Changeset 34081 for trunk/ippTools/src/mergetool.c

Timestamp:

Jun 26, 2012, 11:19:48 AM (14 years ago)

Author:

eugene

Message:

fix a number of cases of unused variables (set but otherwise not used); some of these may have been used to check the presence of a mandatory argument

Location:

trunk/ippTools/src

Files:

• . (modified) (1 prop)
• mergetool.c (modified) (2 diffs)

trunk/ippTools/src/mergetool.c

@@ -738 +738 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     psMetadata *where = psMetadataAlloc();
-    PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
+    // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
     PXOPT_COPY_S64(config->args, where, "-merge_id",     "mergedvodbProcessed.merge_id", "==");
     PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
@@ -1139 +1139 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
+
+  // require? PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
+  // require? PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-mergedvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);