svn commit: samba r7539 - in trunk/source/param: .

gd at samba.org gd at samba.org
Mon Jun 13 15:52:37 GMT 2005


Author: gd
Date: 2005-06-13 15:52:36 +0000 (Mon, 13 Jun 2005)
New Revision: 7539

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

Log:
Merge from 3_0.

Guenther

Modified:
   trunk/source/param/loadparm.c


Changeset:
Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c	2005-06-13 15:26:41 UTC (rev 7538)
+++ trunk/source/param/loadparm.c	2005-06-13 15:52:36 UTC (rev 7539)
@@ -2543,14 +2543,14 @@
 {
 	int classIndex, parmIndex, enumIndex, flagIndex;
 	BOOL hadFlag;
-	char *section_names[] = { "local", "global", NULL};
-	char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
+	const char *section_names[] = { "local", "global", NULL};
+	const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
 		"P_OCTAL", "P_LIST", "P_STRING", "P_USTRING", "P_GSTRING",
 		"P_UGSTRING", "P_ENUM", "P_SEP"};
 	unsigned flags[] = { FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL,
 		FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_DEPRECATED,
 		FLAG_HIDE, FLAG_DOS_STRING};
-	char *flag_names[] = { "FLAG_BASIC", "FLAG_SHARE", "FLAG_PRINT",
+	const char *flag_names[] = { "FLAG_BASIC", "FLAG_SHARE", "FLAG_PRINT",
 		"FLAG_GLOBAL", "FLAG_WIZARD", "FLAG_ADVANCED", "FLAG_DEVELOPER",
 		"FLAG_DEPRECATED", "FLAG_HIDE", "FLAG_DOS_STRING", NULL};
 
@@ -3706,7 +3706,6 @@
 	int i, result = False;
 	parm_class class;
 	unsigned flag = 0;
-	void *ptr;
 
 	if (isGlobal) {
 		class = P_GLOBAL;



More information about the samba-cvs mailing list