Changeset 138 for trunk/samba/source/rpcclient

Timestamp:

Jul 3, 2008, 11:23:12 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.2.0 GA level

File:

• trunk/samba/source/rpcclient/cmd_spoolss.c (modified) (2 diffs)

trunk/samba/source/rpcclient/cmd_spoolss.c

@@ -1220 +1220 @@
  *************************************************************************/
  
-static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
+static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest,
+                                 char **saveptr)
 {
         char    *ptr;
-        char *saveptr;
 
         /* get the next token */
-        ptr = strtok_r(str, delim, &saveptr);
+        ptr = strtok_r(str, delim, saveptr);
 
         /* a string of 'NULL' is used to represent an empty
@@ -1256 +1256 @@
 
         /* fill in the UNISTR fields */
-        str = get_driver_3_param (args, ":", &info->name);
-        str = get_driver_3_param (NULL, ":", &info->driverpath);
-        str = get_driver_3_param (NULL, ":", &info->datafile);
-        str = get_driver_3_param (NULL, ":", &info->configfile);
-        str = get_driver_3_param (NULL, ":", &info->helpfile);
-        str = get_driver_3_param (NULL, ":", &info->monitorname);
-        str = get_driver_3_param (NULL, ":", &info->defaultdatatype);
+        str = get_driver_3_param (args, ":", &info->name, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->driverpath, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->datafile, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->configfile, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->helpfile, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->monitorname, &saveptr);
+        str = get_driver_3_param (NULL, ":", &info->defaultdatatype, &saveptr);
 
         /* <Comma Separated List of Dependent Files> */
-        str2 = get_driver_3_param (NULL, ":", NULL); /* save the beginning of the string */
-        str = str2;                     
+        /* save the beginning of the string */
+        str2 = get_driver_3_param (NULL, ":", NULL, &saveptr);
+        str = str2;
 
         /* begin to strip out each filename */