From: Michael Adam <obnox@samba.org>
Date: Mon, 15 Dec 2008 13:16:06 +0000 (+0100)
Subject: s3:loadparm: rename lp_local_ptr() to lp_local_ptr_by_snum()
X-Git-Tag: samba-4.0.0alpha6~479^2~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91c543f0b5a539da4194f14dee8cad0f980a117e;p=thirdparty%2Fsamba.git

s3:loadparm: rename lp_local_ptr() to lp_local_ptr_by_snum()

Michael
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2a8f83847fe..9d86f16e691 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4260,7 +4260,7 @@ const char *lp_ldap_machine_suffix(void);
 const char *lp_ldap_user_suffix(void);
 const char *lp_ldap_group_suffix(void);
 const char *lp_ldap_idmap_suffix(void);
-void *lp_local_ptr(int snum, void *ptr);
+void *lp_local_ptr_by_snum(int snum, void *ptr);
 bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue);
 void init_locals(void);
 bool lp_is_default(int snum, struct parm_struct *parm);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c74246c98e2..3600266310a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4599,7 +4599,7 @@ static void free_parameter(int snum, struct parm_struct parm)
 	} else if (parm.p_class != P_LOCAL) {
 		return;
 	} else {
-		parm_ptr = lp_local_ptr(snum, parm.ptr);
+		parm_ptr = lp_local_ptr_by_snum(snum, parm.ptr);
 	}
 
 	if ((parm.type == P_STRING) ||
@@ -7171,7 +7171,7 @@ static void init_copymap(struct service *pservice)
  pointer into the default structure.
 ***************************************************************************/
 
-void *lp_local_ptr(int snum, void *ptr)
+void *lp_local_ptr_by_snum(int snum, void *ptr)
 {
 	return (void *)(((char *)ServicePtrs[snum]) + PTR_DIFF(ptr, &sDefault));
 }
@@ -7225,7 +7225,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 			       pszParmName));
 			return (True);
 		}
-		parm_ptr = lp_local_ptr(snum, def_ptr);
+		parm_ptr = lp_local_ptr_by_snum(snum, def_ptr);
 	}
 
 	if (snum >= 0) {
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 27c4b54e2fd..b729e3b2413 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -232,7 +232,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	TALLOC_CTX *ctx = talloc_stackframe();
 
 	if (parm->p_class == P_LOCAL && snum >= 0) {
-		ptr = lp_local_ptr(snum, ptr);
+		ptr = lp_local_ptr_by_snum(snum, ptr);
 	}
 
 	printf("<tr><td>%s</td><td>", get_parm_translated(ctx,
@@ -375,7 +375,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 					void *ptr = parm->ptr;
 
 				if (parm->p_class == P_LOCAL && snum >= 0) {
-					ptr = lp_local_ptr(snum, ptr);
+					ptr = lp_local_ptr_by_snum(snum, ptr);
 				}
 
 				switch (parm->type) {