Changeset 5cf5a4

Timestamp:

May 29, 2010, 2:18:41 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

ffb6bf

Parents:

41b123 (diff), 356180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FixReintroduceExitFlagtoParseCommandLineCall' into CommandLineActionMapping

Conflicts:

molecuilder/src/builder.cpp

Due to this old merge, at the end of main() there were still old memory cleanup routines which got mixed in again.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/builder.cpp (modified) (3 diffs)

molecuilder/src/builder.cpp

@@ -2502 +2502 @@
     char **Arguments = NULL;
     int ArgcSize = 0;
+    int ExitFlag = 0;
     bool ArgumentsCopied = false;
 
@@ -2529 +2530 @@
       char ConfigFileName[MAXSTRINGSIZE];
       // handle arguments by ParseCommandLineOptions()
-      ParseCommandLineOptions(argc,argv,World::getInstance().getMolecules(),World::getInstance().getPeriode(),*World::getInstance().getConfig(), (char *&)ConfigFileName, ArgcList);
+      ExitFlag = ParseCommandLineOptions(argc,argv,World::getInstance().getMolecules(),World::getInstance().getPeriode(),*World::getInstance().getConfig(), (char *&)ConfigFileName, ArgcList);
       // copy all remaining arguments to a new argv
       Arguments = Malloc<char *>(ArgcList.size(), "main - **Arguments");
@@ -2572 +2573 @@
   }
 
-  return (0);
+  return (ExitFlag == 1 ? 0 : ExitFlag);
 }