summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-07-23 14:51:39 +0930
committerAndrew Bartlett <abartlet@samba.org>2012-08-07 23:20:05 +1000
commitd65bded0c2435a62bf0fe33828d6dc5b9a74f936 (patch)
treeecf00fdece09ad102a997192d20070921c6e7c66 /source3/param
parent3bb65aa159cae310b2a5d4998c258d72ace2fa3f (diff)
downloadsamba-d65bded0c2435a62bf0fe33828d6dc5b9a74f936.tar.gz
samba-d65bded0c2435a62bf0fe33828d6dc5b9a74f936.tar.bz2
samba-d65bded0c2435a62bf0fe33828d6dc5b9a74f936.zip
source3/loadparm.c: Move string_set/string_free inside.
The only user, so make them static inside loadparm.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c52
1 files changed, 52 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a4d5bfc551..9c49eb094b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -326,6 +326,58 @@ static void free_param_opts(struct parmlist_entry **popts);
#include "lib/param/param_table.c"
+/* this is used to prevent lots of mallocs of size 1 */
+static const char null_string[] = "";
+
+/**
+ Set a string value, allocing the space for the string
+**/
+
+static bool string_init(char **dest,const char *src)
+{
+ size_t l;
+
+ if (!src)
+ src = "";
+
+ l = strlen(src);
+
+ if (l == 0) {
+ *dest = discard_const_p(char, null_string);
+ } else {
+ (*dest) = SMB_STRDUP(src);
+ if ((*dest) == NULL) {
+ DEBUG(0,("Out of memory in string_init\n"));
+ return false;
+ }
+ }
+ return(true);
+}
+
+/**
+ Free a string value.
+**/
+
+static void string_free(char **s)
+{
+ if (!s || !(*s))
+ return;
+ if (*s == null_string)
+ *s = NULL;
+ SAFE_FREE(*s);
+}
+
+/**
+ Set a string value, deallocating any existing space, and allocing the space
+ for the string
+**/
+
+static bool string_set(char **dest,const char *src)
+{
+ string_free(dest);
+ return(string_init(dest,src));
+}
+
/***************************************************************************
Initialise the sDefault parameter structure for the printer values.
***************************************************************************/