From d65bded0c2435a62bf0fe33828d6dc5b9a74f936 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 23 Jul 2012 14:51:39 +0930 Subject: source3/loadparm.c: Move string_set/string_free inside. The only user, so make them static inside loadparm.c Signed-off-by: Rusty Russell Signed-off-by: Andrew Bartlett --- source3/lib/string_init.c | 77 ----------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 source3/lib/string_init.c (limited to 'source3/lib') diff --git a/source3/lib/string_init.c b/source3/lib/string_init.c deleted file mode 100644 index 40a6ef059b..0000000000 --- a/source3/lib/string_init.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Samba utility functions - - Copyright (C) Andrew Tridgell 1992-2001 - Copyright (C) Simo Sorce 2001-2002 - Copyright (C) Martin Pool 2003 - Copyright (C) James Peach 2006 - Copyright (C) Jeremy Allison 1992-2007 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" - -/* 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. -**/ - -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 -**/ - -bool string_set(char **dest,const char *src) -{ - string_free(dest); - return(string_init(dest,src)); -} -- cgit