diff options
| author | Michael Adam <obnox@samba.org> | 2008-12-15 14:16:06 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-12-15 14:16:06 +0100 |
| commit | 91c543f0b5a539da4194f14dee8cad0f980a117e (patch) | |
| tree | e22c67a53de18b0c3098fcfbf9579f26355444da | |
| parent | 606abdceacfcad19735cd80f59aad975a9e97b7c (diff) | |
| download | samba-91c543f0b5a539da4194f14dee8cad0f980a117e.tar.gz samba-91c543f0b5a539da4194f14dee8cad0f980a117e.tar.bz2 samba-91c543f0b5a539da4194f14dee8cad0f980a117e.zip | |
s3:loadparm: rename lp_local_ptr() to lp_local_ptr_by_snum()
Michael
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source3/web/swat.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 2a8f83847f..9d86f16e69 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 c74246c98e..3600266310 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 27c4b54e2f..b729e3b241 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) { |