svn commit: samba r21284 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-02-11 19:47:38 +0000 (Sun, 11 Feb 2007)
New Revision: 21284

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

Log:
Fix some unitilized variable warnings pointed out by Volker.


Modified:
   branches/SAMBA_3_0/source/nsswitch/idmap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap.c	2007-02-11 19:28:52 UTC (rev 21283)
+++ branches/SAMBA_3_0/source/nsswitch/idmap.c	2007-02-11 19:47:38 UTC (rev 21284)
@@ -260,8 +260,8 @@
 		DEBUGADD(0,("idmap backend option will be IGNORED!\n"));
 	} else if ( lp_idmap_backend() ) {
 		const char **compat_list = lp_idmap_backend();
-		char *p;
-		const char *q;		
+		char *p = NULL;
+		const char *q = NULL;		
 
 		DEBUG(0, ("WARNING: idmap backend is deprecated!\n"));
 		compat = 1;
@@ -274,8 +274,10 @@
 		/* strip any leading idmap_ prefix of */
 		if (strncmp(*compat_list, "idmap_", 6) == 0 ) {
 			q = *compat_list += 6;
-			DEBUG(0, ("WARNING: idmap backend uses obsolete and deprecated 'idmap_' prefix.\n"));
-		       	DEBUGADD(0, ("        Please replace 'idmap_%s' by '%s' in %s\n", p, p, dyn_CONFIGFILE));
+			DEBUG(0, ("WARNING: idmap backend uses obsolete and "
+				  "deprecated 'idmap_' prefix.\n"
+				  "Please replace 'idmap_%s' by '%s' in %s\n", 
+				  q, q, dyn_CONFIGFILE));
 			compat_backend = talloc_strdup( idmap_ctx, q);
 		} else {
 			compat_backend = talloc_strdup( idmap_ctx, *compat_list);

Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap.c	2007-02-11 19:28:52 UTC (rev 21283)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap.c	2007-02-11 19:47:38 UTC (rev 21284)
@@ -260,8 +260,8 @@
 		DEBUGADD(0,("idmap backend option will be IGNORED!\n"));
 	} else if ( lp_idmap_backend() ) {
 		const char **compat_list = lp_idmap_backend();
-		char *p;
-		const char *q;		
+		char *p = NULL;
+		const char *q = NULL;		
 
 		DEBUG(0, ("WARNING: idmap backend is deprecated!\n"));
 		compat = 1;
@@ -274,8 +274,10 @@
 		/* strip any leading idmap_ prefix of */
 		if (strncmp(*compat_list, "idmap_", 6) == 0 ) {
 			q = *compat_list += 6;
-			DEBUG(0, ("WARNING: idmap backend uses obsolete and deprecated 'idmap_' prefix.\n"));
-		       	DEBUGADD(0, ("        Please replace 'idmap_%s' by '%s' in %s\n", p, p, dyn_CONFIGFILE));
+			DEBUG(0, ("WARNING: idmap backend uses obsolete and "
+				  "deprecated 'idmap_' prefix.\n"
+				  "Please replace 'idmap_%s' by '%s' in %s\n", 
+				  q, q, dyn_CONFIGFILE));
 			compat_backend = talloc_strdup( idmap_ctx, q);
 		} else {
 			compat_backend = talloc_strdup( idmap_ctx, *compat_list);