Changeset 9735

Timestamp:

Oct 24, 2006, 2:11:38 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psArrayAlloc

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (5 diffs)
• p2insertPendingFrames.c (modified) (2 diffs)
• p2pendingToDone.c (modified) (2 diffs)
• p2rawToPending.c (modified) (2 diffs)
• p2searchDoneFrames.c (modified) (2 diffs)
• p2searchPendingFrames.c (modified) (4 diffs)
• pxframes.c (modified) (5 diffs)
• pzgetexp.c (modified) (1 diff)
• pzgetimfiles.c (modified) (1 diff)
• pztool.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -278 +278 @@
         }
     }
-    
+
     psTime *use_begin = NULL;
     {
@@ -397 +397 @@
 
     // create new detInputExp row(s) from the rawDetrendExp row(s)
-    psArray *inputExps = psArrayAlloc(psArrayLength(detrendExps));
+    psArray *inputExps = psArrayAllocEmpty(psArrayLength(detrendExps));
     for (long i = 0; i < psArrayLength(detrendExps); i++) {
         detInputExpRow *inputExp = rawDetrenTodetInputExpRow(
@@ -646 +646 @@
         }
     }
-    
+
     psTime *use_begin = NULL;
     {
@@ -714 +714 @@
 
     // create new detInputExp row(s) from the rawDetrendExp row(s)
-    psArray *inputExps = psArrayAlloc(psArrayLength(detrendExps));
+    psArray *inputExps = psArrayAllocEmpty(psArrayLength(detrendExps));
     for (long i = 0; i < psArrayLength(detrendExps); i++) {
         detInputExpRow *inputExp = rawDetrenTodetInputExpRow(
@@ -4555 +4555 @@
     psListIterator *iter = psListIteratorAlloc(exp_tag_list, 0, false);
     psMetadataItem *mItem = NULL;
-    psArray *newInputExps = psArrayAlloc(psListLength(exp_tag_list));
+    psArray *newInputExps = psArrayAllocEmpty(psListLength(exp_tag_list));
     while ((mItem = psListGetAndIncrement(iter))) {
         detInputExpRow *inputExp = psHashLookup(valid_exp_tags,

trunk/ippTools/src/p2insertPendingFrames.c

@@ -66 +66 @@
         );
 
-        psArray *pendingImages = psArrayAlloc(rawFrame->images->n);
+        psArray *pendingImages = psArrayAllocEmpty(rawFrame->images->n);
         for (long j = 0; j < rawFrame->images->n; j++) {
             rawImfileRow *rawImage = rawFrame->images->data[j];
@@ -80 +80 @@
             psArrayAdd(pendingImages, 100, pendingImage);
         }
-        
+
         if (!p2PendingExpInsertObject(config->dbh, pendingExposure)) {
             psError(PS_ERR_UNKNOWN, false, "dbh access failed");

trunk/ippTools/src/p2pendingToDone.c

@@ -29 +29 @@
     PS_ASSERT_PTR_NON_NULL(pendingFrames, NULL);
 
-    psArray *doneFrames = psArrayAlloc(pendingFrames->n);
+    psArray *doneFrames = psArrayAllocEmpty(pendingFrames->n);
 
     for (long i = 0; i < pendingFrames->n; i++) {
@@ -42 +42 @@
         );
 
-        psArray *doneImages = psArrayAlloc(pendingFrame->images->n);
+        psArray *doneImages = psArrayAllocEmpty(pendingFrame->images->n);
         for (long j = 0; j < pendingFrame->images->n; j++) {
             p2PendingImfileRow *pendingImage = pendingFrame->images->data[j];

trunk/ippTools/src/p2rawToPending.c

@@ -29 +29 @@
     PS_ASSERT_PTR_NON_NULL(rawFrames, NULL);
 
-    psArray *pendingFrames = psArrayAlloc(rawFrames->n);
+    psArray *pendingFrames = psArrayAllocEmpty(rawFrames->n);
 
     for (long i = 0; i < rawFrames->n; i++) {
@@ -51 +51 @@
         );
 
-        psArray *pendingImages = psArrayAlloc(rawFrame->images->n);
+        psArray *pendingImages = psArrayAllocEmpty(rawFrame->images->n);
         for (long j = 0; j < rawFrame->images->n; j++) {
             rawImfileRow *rawImage = rawFrame->images->data[j];

trunk/ippTools/src/p2searchDoneFrames.c

@@ -37 +37 @@
 
     // output array of rawScienceFrame
-    psArray *frames = psArrayAlloc(exposures->n);
+    psArray *frames = psArrayAllocEmpty(exposures->n);
 
     for (long i = 0; i < exposures->n; i++) {
@@ -61 +61 @@
 
     return frames;
-} 
+}

trunk/ippTools/src/p2searchPendingFrames.c

@@ -37 +37 @@
 
     // output array of rawSet
-    psArray *frames = psArrayAlloc(exposures->n);
+    psArray *frames = psArrayAllocEmpty(exposures->n);
 
     // 'where' to select each exposure
@@ -55 +55 @@
 
     return frames;
-} 
+}
 
 // XXX EAM : this may be more efficient if we just select all p2PendingImages
@@ -91 +91 @@
     psMetadata *where = NULL;
     if (exp_tag) {
-        where = psMetadataAlloc(); 
+        where = psMetadataAlloc();
         if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_tag", 0, "==", exp_tag)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
@@ -97 +97 @@
             return false;
         }
-    } 
+    }
     psArray *exps = p2PendingExpSelectRowObjects(config->dbh, where, MAX_ROWS);
     psFree(where);

trunk/ippTools/src/pxframes.c

@@ -90 +90 @@
 \
     return true; \
-} 
+}
 
 PX_FRAME_PRINT(pzPendingFrame, pzPendingImfile);
@@ -111 +111 @@
     } \
  \
-    psArray *allFrames = psArrayAlloc(psArrayLength(exposures)); \
+    psArray *allFrames = psArrayAllocEmpty(psArrayLength(exposures)); \
  \
     for (long i = 0; i < psArrayLength(exposures); i++) { \
@@ -143 +143 @@
  \
     return allFrames; \
-} 
+}
 
 PX_FRAME_SEARCH(pzPendingFrame, pzPendingExp, pzPendingImfile, exp_id);
@@ -177 +177 @@
 
 /*
-rawDetrendFrame *newToRawDetrendFrame(pxConfig *config, newFrame *newFrame) 
+rawDetrendFrame *newToRawDetrendFrame(pxConfig *config, newFrame *newFrame)
 {
     newExpRow       *newExp = NULL;
@@ -187 +187 @@
 
     psArray *newImages = newFrame->images;
-    psArray *rawImages = psArrayAlloc(psArrayLength(newImages));
+    psArray *rawImages = psArrayAllocEmpty(psArrayLength(newImages));
     for (long i = 0; i < psArrayLength(newImages); i++) {
         newImfileRow *newImfile = newImages->data[i];

trunk/ippTools/src/pzgetexp.c

@@ -132 +132 @@
     psListIterator *lineCursor = psListIteratorAlloc(doc, 0, false);
 
-    psArray *summitExps = psArrayAlloc(psListLength(doc));
+    psArray *summitExps = psArrayAllocEmpty(psListLength(doc));
     psString line;
     while ((line = psListGetAndIncrement(lineCursor))) {

trunk/ippTools/src/pzgetimfiles.c

@@ -179 +179 @@
     psListIterator *lineCursor = psListIteratorAlloc(doc, 0, false);
 
-    psArray *pzPendingImfiles = psArrayAlloc(psListLength(doc));
+    psArray *pzPendingImfiles = psArrayAllocEmpty(psListLength(doc));
     psString line;
     while ((line = psListGetAndIncrement(lineCursor))) {

trunk/ippTools/src/pztool.c

@@ -285 +285 @@
             }
 
-            psArray *nukeMe = psArrayAlloc(1);
+            psArray *nukeMe = psArrayAllocEmpty(1);
             psArrayAdd(nukeMe, 0, pendingExp);
             bool status = pzPendingExpDeleteRowObjects(config->dbh, nukeMe, MAX_ROWS);