summaryrefslogtreecommitdiff
path: root/source4/param/loadparm.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-08 23:32:13 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:53 +0100
commit5f9aeca0d66c55896a0ab20cf73dda4ca4b22a39 (patch)
tree23bd7ce9af932c5c0955cc84510385c75522ece7 /source4/param/loadparm.c
parent3c12ad6a959e1a99c784882c8e3f36d370c0ba25 (diff)
downloadsamba-5f9aeca0d66c55896a0ab20cf73dda4ca4b22a39.tar.gz
samba-5f9aeca0d66c55896a0ab20cf73dda4ca4b22a39.tar.bz2
samba-5f9aeca0d66c55896a0ab20cf73dda4ca4b22a39.zip
r26347: More tests.
(This used to be commit 5d927b5ca792c2c9da4a1c4f5c3ae880637895e3)
Diffstat (limited to 'source4/param/loadparm.c')
-rw-r--r--source4/param/loadparm.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c3f06512dc..32aaa13b87 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -554,20 +554,6 @@ struct parm_struct *lp_parm_table(void)
return parm_table;
}
-static TALLOC_CTX *lp_talloc;
-
-/******************************************************************* a
- Free up temporary memory - called from the main loop.
-********************************************************************/
-
-void lp_talloc_free(void)
-{
- if (!lp_talloc)
- return;
- talloc_free(lp_talloc);
- lp_talloc = NULL;
-}
-
/*******************************************************************
Convenience routine to grab string parameters into temporary memory
and run standard_sub_basic on them. The buffers can be written to by
@@ -975,7 +961,7 @@ double lp_parm_double(struct loadparm_context *lp_ctx,
{
const char *value = lp_get_parametric(lp_ctx, service, type, option);
- if (value)
+ if (value != NULL)
return lp_double(value);
return default_v;
@@ -990,7 +976,7 @@ bool lp_parm_bool(struct loadparm_context *lp_ctx,
{
const char *value = lp_get_parametric(lp_ctx, service, type, option);
- if (value)
+ if (value != NULL)
return lp_bool(value);
return default_v;