Changeset 38380

Timestamp:

Jun 5, 2015, 12:08:33 PM (11 years ago)

Author:

eugene

Message:

convert to libohana strextend

Location:

branches/eam_branches/ohana.20150429/src/fakeastro

Files:

• include/fakeastro.h (modified) (1 diff)
• src/save_fakestars.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/fakeastro/include/fakeastro.h

@@ -149 +149 @@
 double int_gauss (int i);
 
-int strextend (char *input, char *format,...);
-
 int fakeastro_images ();
 Image *load_template_images (int *nimage);

branches/eam_branches/ohana.20150429/src/fakeastro/src/save_fakestars.c

@@ -48 +48 @@
 
     // need to generate the remote command
-    char command[1024];
-    snprintf (command, 1024, "fakestar_client");
-    strextend (command, "-galaxy");
-    strextend (command, "-hostID %d", host->hostID);
-    strextend (command, "-D CATDIR %s", CATDIR);
-    strextend (command, "-hostdir %s", host->pathname);
-    strextend (command, "-cpt %s", region->name);
-    strextend (command, "-input %s", filename);
+    char *command = NULL;
+    strextend (&command, "fakestar_client");
+    strextend (&command, "-galaxy");
+    strextend (&command, "-hostID %d", host->hostID);
+    strextend (&command, "-D CATDIR %s", CATDIR);
+    strextend (&command, "-hostdir %s", host->pathname);
+    strextend (&command, "-cpt %s", region->name);
+    strextend (&command, "-input %s", filename);
 
     // launch the job on the remote machine (no handshake)
@@ -70 +70 @@
   return TRUE;
 }
-
-int strextend (char *input, char *format,...) {
-
-  char tmpextra[1024], tmpline[1024];
-  va_list argp;
-
-  va_start (argp, format);
-  vsnprintf (tmpextra, 1024, format, argp);
-  snprintf (tmpline, 1024, "%s %s", input, tmpextra);
-  strcpy (input, tmpline);
-
-  return TRUE;
-}