Changeset 31 for branches/1.0/src/splpd.c

Timestamp:

May 8, 2010, 6:13:50 PM (15 years ago)

Author:

herwigb

Message:

Streamline code

File:

• branches/1.0/src/splpd.c (modified) (5 diffs)

branches/1.0/src/splpd.c

@@ -507 +507 @@
         char        spool_dir[256];
         ULONG       ulBootDrive;
-        char        *p1 = NULL;
-        char        *p2 = NULL;
-        char        *p3 = NULL;
-        char        *p4 = NULL;
-        char        *p5 = NULL;
-        char        *p6 = NULL;
-        char        *p7 = NULL;
-        char        *p8 = NULL;
-        char        *p9 = NULL;
+        char        *p_arg[10];
 
         rc = PrfQueryProfileString (HINI_SYSTEMPROFILE,
@@ -587 +579 @@
 
 //  split into single paramters 
-        p1 = strtok (j_parms, " ");
-        p2 = strtok (NULL, " ");
-        p3 = strtok (NULL, " ");
-        p4 = strtok (NULL, " ");
-        p5 = strtok (NULL, " ");
-        p6 = strtok (NULL, " ");
-        p7 = strtok (NULL, " ");
-        p8 = strtok (NULL, " ");
-        p9 = strtok (NULL, " ");
+        p_arg[0] = binfile;
+        for (i=1; i < 10; i++) {
+                if ( i == 1) {
+                        p_arg[i] = strtok(j_parms, " ");
+                } else {
+                        p_arg[i] = strtok(NULL, " ");
+                }
+        };
+        p_arg[10] = NULL;
 
         if (strlen(workingdir) > 0)
@@ -602 +594 @@
         };
 
-        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+        rc = spawnvp(P_WAIT,p_arg[0],p_arg);
 
         while (rc != 0)
         {
-                sprintf(errorstr,"Error during spooling to %s %s %s %s %s %s %s %s %s %s ",binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+                sprintf(errorstr,"Error during spooling to %s %s ",binfile,j_parms,NULL);
 
                 resp = WinMessageBox (HWND_DESKTOP,
@@ -615 +607 @@
                 if (resp != MBID_CANCEL )
                 {
-                        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+                        rc = spawnvp(P_WAIT,p_arg[0],p_arg);
                 }
                 else rc = 0;
@@ -639 +631 @@
         return rc;
 }
-