From 1167c9d9c6c12d142204cfa3cad94f594f7fba76 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 13 Dec 2007 22:46:41 +0100 Subject: r26436: Remove default of 0 for integer parameters when a lp_ctx of NULL is specified (This used to be commit f3395db91a4dd3a89be55684f12313159d1acdd4) --- source4/param/loadparm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 982c186ae9..064f67ba82 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -611,7 +611,7 @@ static const char *lp_string(const char *s) char fn_name(void) {return(*(char *)(ptr));} #endif #define FN_GLOBAL_INTEGER(fn_name,var_name) \ - int fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return 0; return lp_ctx->globals->var_name;} + int fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;} #define FN_LOCAL_STRING(fn_name,val) \ const char *fn_name(struct loadparm_service *service) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault.val)));} -- cgit