Changeset 8062

Timestamp:

Aug 1, 2006, 6:08:45 PM (20 years ago)

Author:

jhoblitt

Message:

use long instead of int as loop counters

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (3 diffs)
• p2insertPendingFrames.c (modified) (4 diffs)
• p2pendingToDone.c (modified) (2 diffs)
• p2rawToPending.c (modified) (2 diffs)
• p2searchDoneFrames.c (modified) (1 diff)
• p2searchPendingFrames.c (modified) (1 diff)
• p2updatePending.c (modified) (1 diff)
• pxframes.c (modified) (2 diffs)

trunk/ippTools/src/chiptool.c

@@ -82 +82 @@
     // dbh prior to /ALL/ of that exposure's Imfiles
     if (pendingFrames) {
-        for (int i = 0; i < rawFrames->n; i++) {
+        for (long i = 0; i < rawFrames->n; i++) {
             rawScienceFrame *rawFrame = rawFrames->data[i];
-            for (int j = 0; j < pendingFrames->n; j++) {
+            for (long j = 0; j < pendingFrames->n; j++) {
                 p2PendingFrame *pendingFrame = pendingFrames->data[j];
                 if (strcmp(rawFrame->exposure->exp_id,
@@ -101 +101 @@
         psArray *doneFrames = p2searchDoneFrames(config);
         if (doneFrames && (rawFrames->n > 0)) {
-            for (int i = 0; i < rawFrames->n; i++) {
+            for (long i = 0; i < rawFrames->n; i++) {
                 rawScienceFrame *rawFrame = rawFrames->data[i];
-                for (int j = 0; j < pendingFrames->n; j++) {
+                for (long j = 0; j < pendingFrames->n; j++) {
                     p2DoneFrame *doneFrame = pendingFrames->data[j];
                     if (strcmp(rawFrame->exposure->exp_id,
@@ -251 +251 @@
     }
 
-    for (int i = 0; i < pendingExps->n; i++) {
+    for (long i = 0; i < pendingExps->n; i++) {
         p2PendingExpRow *pendingExp = pendingExps->data[i];
 

trunk/ippTools/src/p2insertPendingFrames.c

@@ -13 +13 @@
 
     // can we use p2rawToPending() here?
-    for (int i = 0; i < rawFrames->n; i++) {
+    for (long i = 0; i < rawFrames->n; i++) {
         rawScienceFrame *rawFrame = rawFrames->data[i];
 
@@ -32 +32 @@
 
         int version = -1;
-        for (int j = 0; j < exposures->n; j++) {
+        for (long j = 0; j < exposures->n; j++) {
             p2PendingExpRow *exposure = exposures->data[j];
             version = PS_MAX(version, exposure->p2_version);
@@ -56 +56 @@
         psArray *pendingImages = psArrayAlloc(rawFrame->images->n);
         pendingImages->n = 0;
-        for (int j = 0; j < rawFrame->images->n; j++) {
+        for (long j = 0; j < rawFrame->images->n; j++) {
             rawImfileRow *rawImage = rawFrame->images->data[j];
             p2PendingImfileRow *pendingImage = p2PendingImfileRowAlloc(
@@ -76 +76 @@
         }
 
-        for (int i = 0; i < pendingImages->n; i++) {
+        for (long i = 0; i < pendingImages->n; i++) {
             if (!p2PendingImfileInsertObject(config->dbh,
                     pendingImages->data[i])) {

trunk/ippTools/src/p2pendingToDone.c

@@ -13 +13 @@
     doneFrames->n = 0;
 
-    for (int i = 0; i < pendingFrames->n; i++) {
+    for (long i = 0; i < pendingFrames->n; i++) {
         p2PendingFrame *pendingFrame = pendingFrames->data[i];
 // if (pendingFrame->exposure->state != P2_STATE_DONE) continue;
@@ -33 +33 @@
         psArray *doneImages = psArrayAlloc(pendingFrame->images->n);
         doneImages->n = 0;
-        for (int j = 0; j < pendingFrame->images->n; j++) {
+        for (long j = 0; j < pendingFrame->images->n; j++) {
             p2PendingImfileRow *pendingImage = pendingFrame->images->data[j];
 

trunk/ippTools/src/p2rawToPending.c

@@ -13 +13 @@
     pendingFrames->n = 0;
 
-    for (int i = 0; i < rawFrames->n; i++) {
+    for (long i = 0; i < rawFrames->n; i++) {
         rawScienceFrame *rawFrame = rawFrames->data[i];
 
@@ -32 +32 @@
         psArray *pendingImages = psArrayAlloc(rawFrame->images->n);
         pendingImages->n = 0;
-        for (int j = 0; j < rawFrame->images->n; j++) {
+        for (long j = 0; j < rawFrame->images->n; j++) {
             rawImfileRow *rawImage = rawFrame->images->data[j];
             p2PendingImfileRow *pendingImage = p2PendingImfileRowAlloc(

trunk/ippTools/src/p2searchDoneFrames.c

@@ -21 +21 @@
     frames->n = 0;
 
-    for (int i = 0; i < exposures->n; i++) {
+    for (long i = 0; i < exposures->n; i++) {
         p2DoneExpRow *exposure = exposures->data[i];
 

trunk/ippTools/src/p2searchPendingFrames.c

@@ -23 +23 @@
     // 'where' to select each exposure
     psMetadata *where = psMetadataAlloc();
-    for (int i = 0; i < exposures->n; i++) {
+    for (long i = 0; i < exposures->n; i++) {
         p2PendingExpRow *exposure = exposures->data[i];
 

trunk/ippTools/src/p2updatePending.c

@@ -18 +18 @@
     // we will now select all of the matching images which are done
     psMetadataAddS32 (where, PS_LIST_TAIL, "STATE", PS_META_REPLACE, "==", PX_MODE_DONE);
-    for (int i = 0; i < exposures->n; i++) {
+    for (long i = 0; i < exposures->n; i++) {
         p2PendingExpRow *exposure = exposures->data[i];
 

trunk/ippTools/src/pxframes.c

@@ -51 +51 @@
     psMetadata *output = psMetadataAlloc(); \
 \
-    for (int i = 0; i < psArrayLength(frames); i++) { \
+    for (long i = 0; i < psArrayLength(frames); i++) { \
         frametype *frame = frames->data[i]; \
         PS_ASSERT_PTR_NON_NULL(frame, false); \
         PS_ASSERT_PTR_NON_NULL(frame->images, false); \
 \
-        for (int j = 0; j < psArrayLength(frame->images); j++) { \
+        for (long j = 0; j < psArrayLength(frame->images); j++) { \
             imfiletype##Row *image = frame->images->data[j]; \
             psMetadata *md = imfiletype##MetadataFromObject(image); \
@@ -93 +93 @@
     psArray *allFrames = psArrayAlloc(psArrayLength(exposures)); \
  \
-    for (int i = 0; i < psArrayLength(exposures); i++) { \
+    for (long i = 0; i < psArrayLength(exposures); i++) { \
         exptype##Row *exposure = exposures->data[i]; \
 \