Changeset 3805

Timestamp:

Apr 29, 2005, 8:38:32 AM (21 years ago)

Author:

rhl

Message:

1/ Factor poisConfigAlloc() out of poisParseConfig()
2/ help() can and should be static (and not declared in pois.h)

File:

• trunk/pois/src/poisParseConfig.c (modified) (3 diffs)

trunk/pois/src/poisParseConfig.c

@@ -4 +4 @@
 #include "pois.h"
 
-void help(void)
+static void help(void)
 {
     fprintf (stderr, "POIS: Pan-STARRS (or Pricey's) Optimal Image Subtraction\n"
@@ -26 +26 @@
 }
 
-poisConfig *poisParseConfig(int argc, // Number of command-line arguments
-                            char **argv // Command-line arguments
-    )
+poisConfig *restrict poisConfigAlloc(void)
 {
-    poisConfig *config;                 // Configuration values
-
-    /* Variables for getopt */
-    int opt;   /* Option, from getopt */
-    extern char *optarg;   /* Argument accompanying switch */
-    extern int optind;   /* getopt variables */
-
-    /* Initialise configuration */
-    config = (poisConfig *) psAlloc(sizeof(poisConfig));
+    poisConfig *config = (poisConfig *) psAlloc(sizeof(poisConfig));
     config->verbose = 0;
     config->refFile = NULL;
@@ -57 +47 @@
     config->sigmaRej = 2.5;
     config->penalty = 0.0;
+
+    return config;
+}
+
+
+poisConfig *poisParseConfig(int argc, // Number of command-line arguments
+                            char **argv // Command-line arguments
+    )
+{
+    poisConfig *config  = poisConfigAlloc(); // Configuration values
+
+    /* Variables for getopt */
+    int opt;   /* Option, from getopt */
+    extern char *optarg;   /* Argument accompanying switch */
+    extern int optind;   /* getopt variables */
+
+    /* Initialise configuration */
 
     /* Parse command-line arguments using getopt */