Changeset 7064 for trunk/ppMerge/src/ppMerge.c

Timestamp:

May 3, 2006, 6:12:17 PM (20 years ago)

Author:

Paul Price

Message:

Fixes for compilation

File:

• trunk/ppMerge/src/ppMerge.c (modified) (3 diffs)

trunk/ppMerge/src/ppMerge.c

@@ -4 +4 @@
 
 #include "ppMerge.h"
-#include "ppMem.h"
+#include "ppMergeConfig.h"
+#include "ppMergeData.h"
+#include "ppMergeOptions.h"
+#include "ppMergeCheckInputs.h"
+#include "ppMergeBackground.h"
+#include "ppMergeCombine.h"
+
+//#include "ppMem.h"
 
 int main(int argc, char **argv)
 {
-    ppMergeOptions *options = ppMergeOptionsAlloc();
-    ppConfig *config = ppConfigAlloc();
-
     psTimerStart(TIMERNAME);
 
@@ -25 +29 @@
     ppMergeData *data = ppMergeCheckInputs(options, config);
     if (!data) {
-        psError("Not enough valid input files.\n");
+        psError(PS_ERR_IO, false, "Not enough valid input files.\n");
         exit(EXIT_FAILURE);
     }
@@ -50 +54 @@
     pmConfigDone();
 
-    ppMemCheck();
+//    ppMemCheck();
 
     return EXIT_SUCCESS;