svn commit: samba r5944 - in branches/SAMBA_3_0/source/rpcclient: .

jerry at samba.org jerry at samba.org
Tue Mar 22 14:33:31 GMT 2005


Author: jerry
Date: 2005-03-22 14:33:30 +0000 (Tue, 22 Mar 2005)
New Revision: 5944

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5944

Log:
cleaning up compiler warnings reported by Jason Mader
Modified:
   branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
   branches/SAMBA_3_0/source/rpcclient/rpcclient.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2005-03-22 14:20:25 UTC (rev 5943)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2005-03-22 14:33:30 UTC (rev 5944)
@@ -1283,7 +1283,7 @@
  wrapper for strtok to get the next parameter from a delimited list.
  Needed to handle the empty parameter string denoted by "NULL"
  *************************************************************************/
-static char* get_driver_3_param (const char* str, const char* delim, UNISTR* dest)
+static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
 {
 	char	*ptr;
 
@@ -1310,11 +1310,8 @@
 	     <Config File Name>:<Help File Name>:<Language Monitor Name>:\
 	     <Default Data Type>:<Comma Separated list of Files> 
  *******************************************************************************/
-static BOOL init_drv_info_3_members (
-	TALLOC_CTX *mem_ctx, 
-	DRIVER_INFO_3 *info, 
-	const char *args
-)
+static BOOL init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info, 
+                                      char *args )
 {
 	char	*str, *str2;
 	uint32	len, i;
@@ -1370,6 +1367,7 @@
 	DRIVER_INFO_3		info3;
 	const char		*arch;
 	fstring			driver_name;
+	char 			*driver_args;
 
 	/* parse the command arguements */
 	if (argc != 3 && argc != 4)
@@ -1393,7 +1391,8 @@
 	else
 		set_drv_info_3_env(&info3, arch);
 
-	if (!init_drv_info_3_members(mem_ctx, &info3, argv[2]))
+	driver_args = talloc_strdup( mem_ctx, argv[2] );
+	if (!init_drv_info_3_members(mem_ctx, &info3, driver_args ))
 	{
 		printf ("Error Invalid parameter list - %s.\n", argv[2]);
 		return WERR_INVALID_PARAM;

Modified: branches/SAMBA_3_0/source/rpcclient/rpcclient.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/rpcclient.c	2005-03-22 14:20:25 UTC (rev 5943)
+++ branches/SAMBA_3_0/source/rpcclient/rpcclient.c	2005-03-22 14:33:30 UTC (rev 5944)
@@ -24,7 +24,6 @@
 #include "rpcclient.h"
 
 DOM_SID domain_sid;
-static int pipe_idx;
 
 
 /* List to hold groups of commands.
@@ -559,7 +558,6 @@
 
      /* Run command */
 
-	pipe_idx = cmd_entry->pipe_idx;
      if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) {
           ntresult = cmd_entry->ntfn(cli, mem_ctx, argc, (const char **) argv);
           if (!NT_STATUS_IS_OK(ntresult)) {



More information about the samba-cvs mailing list