Changeset 27096 for trunk/pswarp/src/pswarpSetMaskBits.c

Timestamp:

Feb 25, 2010, 4:26:50 PM (16 years ago)

Author:

Paul Price

Message:

Reworking error codes to get consistent exit codes.

File:

• trunk/pswarp/src/pswarpSetMaskBits.c (modified) (4 diffs)

trunk/pswarp/src/pswarpSetMaskBits.c

@@ -28 +28 @@
     // this function sets the required single-image mask bits
     if (!pmConfigMaskSetBits (&maskIn, &markIn, config)) {
-        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
+        psError (psErrorCodeLast(), false, "Unable to define the mask bit values");
         return false;
     }
@@ -64 +64 @@
     }
     if (!markOut) {
-        psError (PS_ERR_UNKNOWN, true, "Unable to define the MARK bit mask: all bits taken!");
+        psError(PSWARP_ERR_CONFIG, true, "Unable to define the MARK bit mask: all bits taken!");
         return false;
     }
@@ -71 +71 @@
     psMetadata *warpRecipe = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
     if (!warpRecipe) {
-        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        psError(PSWARP_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
         return false;
     }
@@ -85 +85 @@
     psMetadata *psphotRecipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
     if (!psphotRecipe) {
-        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
+        psError(PSWARP_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
         return false;
     }