Changeset 8045

Timestamp:

Aug 1, 2006, 3:51:26 PM (20 years ago)

Author:

jhoblitt

Message:

move p2pendingToDoneImfile() into p2search.c

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (2 diffs)
• p2pendingToDone.c (modified) (1 diff)
• pxtools.h (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -156 +156 @@
 static bool doneMode(pxConfig *config)
 {
-    // get exp_id/class/class_id/uri from the CLI // add the completed imfile to
-    // the p2DoneImfile tables // remove corresponding entries from the
-    // p2PendingImfile table // check to see if any p2PendingExps have no
-    // associated p2PendingImfiles //    if so move the p2PendingExp(s) to
-    // p2DoneExp
+    // get exp_id/class/class_id/uri from the CLI
+    // add the completed imfile to
+    // the p2DoneImfile tables
+    // remove corresponding entries from the
+    // p2PendingImfile table 
+    // check to see if any p2PendingExps have no
+    // associated p2PendingImfiles 
+    // if so move the p2PendingExp(s) to p2DoneExp
 
     // find pending
@@ -239 +242 @@
     return true;
 }
+
+// XXX the filename layout is defined by this code
+psArray *p2pendingToDoneImfile(psArray *pendingImfiles)
+{
+    PS_ASSERT_PTR_NON_NULL(pendingImfiles, NULL);
+
+    psArray *doneImfiles = psArrayAlloc(pendingImfiles->n);
+    doneImfiles->n = 0;
+
+    for (int i = 0; i < pendingImfiles->n; i++) {
+        p2PendingImfileRow *pendingImfile = pendingImfiles->data[i];
+
+        p2DoneImfileRow *doneImfile = p2DoneImfileRowAlloc(
+            pendingImfile->exp_id,
+            pendingImfile->class_id,
+            pendingImfile->uri,
+            "my recipe", // recipe
+            "my stats", // stats
+            pendingImfile->p1_version,
+            pendingImfile->p2_version
+        );
+
+        psArrayAdd(doneImfiles, 100, doneImfile);
+    }
+
+    return doneImfiles;
+}

trunk/ippTools/src/p2pendingToDone.c

@@ -64 +64 @@
 }
 
-// XXX the filename layout is defined by this code
-psArray *p2pendingToDoneImfile(psArray *pendingImfiles)
-{
-    PS_ASSERT_PTR_NON_NULL(pendingImfiles, NULL);
-
-    psArray *doneImfiles = psArrayAlloc(pendingImfiles->n);
-    doneImfiles->n = 0;
-
-    for (int i = 0; i < pendingImfiles->n; i++) {
-        p2PendingImfileRow *pendingImfile = pendingImfiles->data[i];
-
-        p2DoneImfileRow *doneImfile = p2DoneImfileRowAlloc(
-            pendingImfile->exp_id,
-            pendingImfile->class_id,
-            pendingImfile->uri,
-            "my recipe", // recipe
-            "my stats", // stats
-            pendingImfile->p1_version,
-            pendingImfile->p2_version
-        );
-
-        psArrayAdd(doneImfiles, 100, doneImfile);
-    }
-
-    return doneImfiles;
-}
-
 p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp)
 {

trunk/ippTools/src/pxtools.h

@@ -124 +124 @@
 psArray *p2searchDoneFrames(pxConfig *config);
 psArray *p2searchPendingImfiles(pxConfig *config);
-psArray *p2pendingToDoneImfile(psArray *pendingImfiles);
 psArray *p2searchPendingExp(pxConfig *config);
 p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp);