Index: /branches/eam_branches/ipp-20140904/Ohana/src/addstar/include/loadICRF.h
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/addstar/include/loadICRF.h	(revision 37793)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/addstar/include/loadICRF.h	(revision 37794)
@@ -12,6 +12,6 @@
 char *INPUT;
 
-AddstarClientOptions args_loadICRF (int argc, char **argv, AddstarClientOptions options);
-AddstarClientOptions args_loadICRF_client (int argc, char **argv, AddstarClientOptions options);
+AddstarClientOptions args_loadICRF (int *argc, char **argv, AddstarClientOptions options);
+AddstarClientOptions args_loadICRF_client (int *argc, char **argv, AddstarClientOptions options);
 
 int loadICRF_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options);
Index: /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadICRF.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadICRF.c	(revision 37793)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadICRF.c	(revision 37794)
@@ -5,11 +5,11 @@
 static void help_client (void);
 
-AddstarClientOptions args_loadICRF (int argc, char **argv, AddstarClientOptions options) {
+AddstarClientOptions args_loadICRF (int *argc, char **argv, AddstarClientOptions options) {
   
   int N;
 
   /* check for help request */
-  if (get_argument (argc, argv, "-help") ||
-      get_argument (argc, argv, "-h")) {
+  if (get_argument (*argc, argv, "-help") ||
+      get_argument (*argc, argv, "-h")) {
     help ();
   }
@@ -28,20 +28,20 @@
   HOST_ID = 0;
   PARALLEL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel"))) {
+  if ((N = get_argument (*argc, argv, "-parallel"))) {
     PARALLEL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   // this is a test mode : rather than launching the remote jobs and waiting for completion,
   // relphot will simply list the remote command and wait for the user to signal completion
   PARALLEL_MANUAL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel-manual"))) {
+  if ((N = get_argument (*argc, argv, "-parallel-manual"))) {
     PARALLEL = TRUE; // -parallel-manual implies -parallel
     PARALLEL_MANUAL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   // this is a test mode : rather than launching the relphot_client jobs remotely, they are 
   // run in serial via 'system'
   PARALLEL_SERIAL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel-serial"))) {
+  if ((N = get_argument (*argc, argv, "-parallel-serial"))) {
     if (PARALLEL_MANUAL) {
       fprintf (stderr, "ERROR: cannot mix -parallel-manual and -parallel-serial\n");
@@ -50,25 +50,25 @@
     PARALLEL = TRUE; // -parallel-serial implies -parallel
     PARALLEL_SERIAL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
   /* only add to existing regions */
   options.existing_regions = FALSE;
-  if ((N = get_argument (argc, argv, "-existing-regions"))) {
+  if ((N = get_argument (*argc, argv, "-existing-regions"))) {
     options.existing_regions = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   /* replace measurement, don't duplicate (ref/cat only) */
   options.replace = FALSE;
-  if ((N = get_argument (argc, argv, "-replace"))) {
+  if ((N = get_argument (*argc, argv, "-replace"))) {
     options.replace = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
   /* extra error messages */
   VERBOSE = FALSE;
-  if ((N = get_argument (argc, argv, "-v"))) {
+  if ((N = get_argument (*argc, argv, "-v"))) {
     VERBOSE = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
@@ -90,5 +90,5 @@
   DUMP = NULL;
 
-  if (argc < 2) {
+  if (*argc < 2) {
     fprintf (stderr, "USAGE: loadICRF [options] (file) [..more files]\n");
     exit (2);
@@ -97,11 +97,11 @@
 }
 
-AddstarClientOptions args_loadICRF_client (int argc, char **argv, AddstarClientOptions options) {
+AddstarClientOptions args_loadICRF_client (int *argc, char **argv, AddstarClientOptions options) {
   
   int N;
 
   /* check for help request */
-  if (get_argument (argc, argv, "-help") ||
-      get_argument (argc, argv, "-h")) {
+  if (get_argument (*argc, argv, "-help") ||
+      get_argument (*argc, argv, "-h")) {
     help ();
   }
@@ -112,32 +112,32 @@
 
   HOST_ID = 0;
-  if ((N = get_argument (argc, argv, "-hostID"))) {
-    remove_argument (N, &argc, argv);
+  if ((N = get_argument (*argc, argv, "-hostID"))) {
+    remove_argument (N, argc, argv);
     HOST_ID = atoi (argv[N]);
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   if (!HOST_ID) help_client();
 
   HOSTDIR = NULL;
-  if ((N = get_argument (argc, argv, "-hostdir"))) {
-    remove_argument (N, &argc, argv);
+  if ((N = get_argument (*argc, argv, "-hostdir"))) {
+    remove_argument (N, argc, argv);
     HOSTDIR = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   if (!HOSTDIR) help_client();
 
   CPT_FILE = NULL;
-  if ((N = get_argument (argc, argv, "-cpt"))) {
-    remove_argument (N, &argc, argv);
+  if ((N = get_argument (*argc, argv, "-cpt"))) {
+    remove_argument (N, argc, argv);
     CPT_FILE = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   if (!CPT_FILE) help_client();
   
   INPUT = NULL;
-  if ((N = get_argument (argc, argv, "-input"))) {
-    remove_argument (N, &argc, argv);
+  if ((N = get_argument (*argc, argv, "-input"))) {
+    remove_argument (N, argc, argv);
     INPUT = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   if (!INPUT) help_client();
@@ -151,20 +151,20 @@
   /* only add to existing objects */
   options.only_match = FALSE;
-  if ((N = get_argument (argc, argv, "-only-match"))) {
+  if ((N = get_argument (*argc, argv, "-only-match"))) {
     options.only_match = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   /* replace measurement, don't duplicate (ref/cat only) */
   options.replace = FALSE;
-  if ((N = get_argument (argc, argv, "-replace"))) {
+  if ((N = get_argument (*argc, argv, "-replace"))) {
     options.replace = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
   /* extra error messages */
   VERBOSE = FALSE;
-  if ((N = get_argument (argc, argv, "-v"))) {
+  if ((N = get_argument (*argc, argv, "-v"))) {
     VERBOSE = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
@@ -186,5 +186,5 @@
   DUMP = NULL;
 
-  if (argc != 1) {
+  if (*argc != 1) {
     fprintf (stderr, "USAGE: loadICRF_client -cpt (file) -input (file)\n");
     exit (2);
Index: /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF.c	(revision 37793)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF.c	(revision 37794)
@@ -17,5 +17,5 @@
 
   options = ConfigInit (&argc, argv);
-  options = args_loadICRF (argc, argv, options); // XXX fix args after rest is done
+  options = args_loadICRF (&argc, argv, options); // XXX fix args after rest is done
 
   // load the full sky description table (dvodb must exist)
Index: /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF_client.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF_client.c	(revision 37793)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF_client.c	(revision 37794)
@@ -8,5 +8,5 @@
   // need to construct these options with args_loadICRF...
   options = ConfigInit (&argc, argv);
-  options = args_loadICRF_client (argc, argv, options);
+  options = args_loadICRF_client (&argc, argv, options);
 
   // client is called with a pointer to the file to be loaded