Changeset 41f82c

Timestamp:

Jul 10, 2012, 1:15:50 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

3cb97b

Parents:

3d4397

git-author:

Frederik Heber <heber@…> (07/06/12 18:54:01)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:50)

Message:

Extracted parsing input into keyvalue into own function.

File:

• src/bin/mpqc/mpqc.cc (modified) (2 diffs)

src/bin/mpqc/mpqc.cc

@@ -570 +570 @@
 }
 
-int
-try_main(int argc, char *argv[])
-{
-  //trash_stack();
-
-  int i;
-  const char *devnull = "/dev/null";
-  atexit(clean_up);
-
-#ifdef HAVE_FEENABLEEXCEPT
-  // this uses a glibc extension to trap on individual exceptions
-# ifdef FE_DIVBYZERO
-  feenableexcept(FE_DIVBYZERO);
-# endif
-# ifdef FE_INVALID
-  feenableexcept(FE_INVALID);
-# endif
-# ifdef FE_OVERFLOW
-  feenableexcept(FE_OVERFLOW);
-# endif
-#endif
-
-#ifdef HAVE_FEDISABLEEXCEPT
-  // this uses a glibc extension to not trap on individual exceptions
-# ifdef FE_UNDERFLOW
-  fedisableexcept(FE_UNDERFLOW);
-# endif
-# ifdef FE_INEXACT
-  fedisableexcept(FE_INEXACT);
-# endif
-#endif
-
-#if defined(HAVE_SETRLIMIT)
-  struct rlimit rlim;
-  rlim.rlim_cur = 0;
-  rlim.rlim_max = 0;
-  setrlimit(RLIMIT_CORE,&rlim);
-#endif
-
-  ExEnv::init(argc, argv);
-
-  // parse commandline options
-  GetLongOpt options;
-  int optind = ParseOptions(options, argc, argv);
-  const char *output = 0;
-  ostream *outstream = 0;
-  ComputeOptions(options, output, outstream);
-
-  // get the message group.  first try the commandline and environment
-  Ref<MessageGrp> grp;
-  getMessageGroup(grp, argc, argv);
-
-  // get input file names, either object-oriented or generic
-  const char *object_input = 0;
-  const char *generic_input = 0;
-  getInputFileNames(object_input, generic_input, options, argc, argv);
-  const char *input;
-  if (object_input) input = object_input;
-  if (generic_input) input = generic_input;
-
-  Ref<ParsedKeyVal> parsedkv;
+/** Parse the input file into the key value container.
+ *
+ * \param grp message group
+ * \param parsedkev keyvalue container
+ * \param options options structure
+ * \param input input file name
+ * \param generic_input filename of generic input
+ */
+void parseInputfile(
+    Ref<MessageGrp> &grp,
+    Ref<ParsedKeyVal> &parsedkv,
+    GetLongOpt &options,
+    const char *&input,
+    const char *&generic_input
+    )
+{
   // read the input file on only node 0
   char *in_char_array;
@@ -685 +640 @@
     }
   delete[] in_char_array;
-
+}
+
+int
+try_main(int argc, char *argv[])
+{
+  //trash_stack();
+
+  int i;
+  const char *devnull = "/dev/null";
+  atexit(clean_up);
+
+#ifdef HAVE_FEENABLEEXCEPT
+  // this uses a glibc extension to trap on individual exceptions
+# ifdef FE_DIVBYZERO
+  feenableexcept(FE_DIVBYZERO);
+# endif
+# ifdef FE_INVALID
+  feenableexcept(FE_INVALID);
+# endif
+# ifdef FE_OVERFLOW
+  feenableexcept(FE_OVERFLOW);
+# endif
+#endif
+
+#ifdef HAVE_FEDISABLEEXCEPT
+  // this uses a glibc extension to not trap on individual exceptions
+# ifdef FE_UNDERFLOW
+  fedisableexcept(FE_UNDERFLOW);
+# endif
+# ifdef FE_INEXACT
+  fedisableexcept(FE_INEXACT);
+# endif
+#endif
+
+#if defined(HAVE_SETRLIMIT)
+  struct rlimit rlim;
+  rlim.rlim_cur = 0;
+  rlim.rlim_max = 0;
+  setrlimit(RLIMIT_CORE,&rlim);
+#endif
+
+  ExEnv::init(argc, argv);
+
+  // parse commandline options
+  GetLongOpt options;
+  int optind = ParseOptions(options, argc, argv);
+  const char *output = 0;
+  ostream *outstream = 0;
+  ComputeOptions(options, output, outstream);
+
+  // get the message group.  first try the commandline and environment
+  Ref<MessageGrp> grp;
+  getMessageGroup(grp, argc, argv);
+
+  // get input file names, either object-oriented or generic
+  const char *object_input = 0;
+  const char *generic_input = 0;
+  getInputFileNames(object_input, generic_input, options, argc, argv);
+  const char *input;
+  if (object_input) input = object_input;
+  if (generic_input) input = generic_input;
+
+  // parse input into keyvalue container
+  Ref<ParsedKeyVal> parsedkv;
+  parseInputfile(grp, parsedkv, options, input, generic_input);
   if (options.retrieve("k")) parsedkv->verbose(1);
   Ref<KeyVal> keyval = new PrefixKeyVal(parsedkv.pointer(),"mpqc");