summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-28 19:56:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:08 -0500
commit4abb4797613868e518baafb5f3618e78f67ac05c (patch)
treead67cecd99652512a1ed82107b6aac10bd2983f7 /source4/param
parentdc6735457975ada838a03de7ca26efa0cf607f99 (diff)
downloadsamba-4abb4797613868e518baafb5f3618e78f67ac05c.tar.gz
samba-4abb4797613868e518baafb5f3618e78f67ac05c.tar.bz2
samba-4abb4797613868e518baafb5f3618e78f67ac05c.zip
r10588: Remove more unused files, macros
(This used to be commit d2f80c0457f7404b2cac9df59a400130e9ad025f)
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/loadparm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 7576b05d83..18c8d47746 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1485,7 +1485,9 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
pdata = pdata->next;
}
if (not_added) {
- paramo = smb_xmalloc_p(struct param_opt);
+ paramo = malloc_p(struct param_opt);
+ if (!paramo)
+ smb_panic("OOM");
paramo->key = strdup(data->key);
paramo->value = strdup(data->value);
DLIST_ADD(pserviceDest->param_opt, paramo);
@@ -1742,7 +1744,9 @@ static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const
}
}
- paramo = smb_xmalloc_p(struct param_opt);
+ paramo = malloc_p(struct param_opt);
+ if (!paramo)
+ smb_panic("OOM");
paramo->key = strdup(name);
paramo->value = strdup(pszParmValue);
paramo->flags = flags;