From e63d5d2cd56cda2a01aace7c93dcae18dc80df5c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 29 Jun 2011 09:52:46 +1000 Subject: s3-param use lp_parm_ptr() rather than parm.ptr directly This will help with a change from .ptr to .offset Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Wed Jun 29 03:26:21 CEST 2011 on sn-devel-104 --- source3/web/swat.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source3/web') diff --git a/source3/web/swat.c b/source3/web/swat.c index 277b25c426..190006b3cc 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -234,13 +234,15 @@ static void print_footer(void) static void show_parameter(int snum, struct parm_struct *parm) { int i; - void *ptr = parm->ptr; + void *ptr; char *utf8_s1, *utf8_s2; size_t converted_size; TALLOC_CTX *ctx = talloc_stackframe(); if (parm->p_class == P_LOCAL && snum >= 0) { - ptr = lp_local_ptr_by_snum(snum, ptr); + ptr = lp_local_ptr_by_snum(snum, parm); + } else { + ptr = lp_parm_ptr(NULL, parm); } printf("%s", get_parm_translated(ctx, @@ -380,10 +382,11 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte if (!( parm_filter & FLAG_ADVANCED )) { if (!(parm->flags & FLAG_BASIC)) { - void *ptr = parm->ptr; - + void *ptr; if (parm->p_class == P_LOCAL && snum >= 0) { - ptr = lp_local_ptr_by_snum(snum, ptr); + ptr = lp_local_ptr_by_snum(snum, parm); + } else { + ptr = lp_parm_ptr(NULL, parm); } switch (parm->type) { -- cgit