Changeset 30015 for branches/eam_branches/ipp-20101205/ppStack/src/ppStackArguments.c

Timestamp:

Dec 10, 2010, 8:17:41 AM (15 years ago)

Author:

eugene

Message:

re-organize ppStackLoop to make the steps clearer: add separate functions for UpdateHeader, JPEGs, Stats; move cluttered includes into ppStack.h; push DIE section of ppStack.c into ppStackCleanup (like ppImageCleanup); rename old ppStackCleanup to ppStackCleanupFiles; consolidate file cleanup block in ppStackLoop (for unconvolved outputs) into ppStackCleanupFiles; add options for stack type

File:

• branches/eam_branches/ipp-20101205/ppStack/src/ppStackArguments.c (modified) (2 diffs)

branches/eam_branches/ipp-20101205/ppStack/src/ppStackArguments.c

@@ -1 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <pslib.h>
-#include <psmodules.h>
-
 #include "ppStack.h"
 
@@ -198 +189 @@
 
     // stack-type : used to define the stack for PSPS
-    if ((N = psArgumentGet (argc, argv, "-stack-type"))) {
-        if (argc <= N+1) {
-          psErrorStackPrint(stderr, "Expected to see an argument for -stack-type");
-          exit(PS_EXIT_CONFIG_ERROR);
+    if ((argNum = psArgumentGet (argc, argv, "-stack-type"))) {
+        if (argc <= argNum+1) {
+            psErrorStackPrint(stderr, "Expected to see an argument for -stack-type");
+            exit(PS_EXIT_CONFIG_ERROR);
         }
-        psArgumentRemove (N, &argc, argv);
-        if (strcasecmp(argv[N], "NIGHTLY_STACK") && strcasecmp(argv[N], "DEEP_STACK") && strcasecmp(argv[N], "IQ_STACK")) {
-          psErrorStackPrint(stderr, "Invalid option for -stack-type %s (must be one of NIGHTLY_STACK, DEEP_STACK, IQ_STACK)");
-          exit(PS_EXIT_CONFIG_ERROR);
+        psArgumentRemove (argNum, &argc, argv);
+        if (strcasecmp(argv[argNum], "NIGHTLY_STACK") && strcasecmp(argv[argNum], "DEEP_STACK") && strcasecmp(argv[argNum], "IQ_STACK")) {
+            psErrorStackPrint(stderr, "Invalid option for -stack-type %s (must be one of NIGHTLY_STACK, DEEP_STACK, IQ_STACK)", argv[argNum]);
+            exit(PS_EXIT_CONFIG_ERROR);
         }
-        psMetadataAddStr (arguments, PS_LIST_TAIL, "STACK_TYPE", PS_META_REPLACE, "Stack Type", argv[N]);
-        psArgumentRemove (N, &argc, argv);
+        psMetadataAddStr (arguments, PS_LIST_TAIL, "STACK_TYPE", PS_META_REPLACE, "Stack Type", argv[argNum]);
+        psArgumentRemove (argNum, &argc, argv);
     } else { 
         psMetadataAddStr (arguments, PS_LIST_TAIL, "STACK_TYPE", PS_META_REPLACE, "Stack Type", "DEEP_STACK");