summaryrefslogtreecommitdiff
path: root/source3/lib/util_str.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-25 14:53:32 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-31 00:32:07 +0200
commit53140724f149058a8404727533ae792cbb8b1340 (patch)
tree3068a0782c4a4568e41be5907a1cac196833dfda /source3/lib/util_str.c
parent8524924a460349a9aa56db475d771b8884fbe517 (diff)
downloadsamba-53140724f149058a8404727533ae792cbb8b1340.tar.gz
samba-53140724f149058a8404727533ae792cbb8b1340.tar.bz2
samba-53140724f149058a8404727533ae792cbb8b1340.zip
s3-lib Move string_init functions into their own file
These have not been moved in common, as they are not talloc-based, but it helps with dependencies if these are seperated from the rest of util_str.c Andrew Bartlett
Diffstat (limited to 'source3/lib/util_str.c')
-rw-r--r--source3/lib/util_str.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index bb8482ca0b..82d814ad9d 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -227,58 +227,6 @@ bool in_list(const char *s, const char *list, bool casesensitive)
return ret;
}
-/* 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));
-}
-
void fstring_sub(char *s,const char *pattern,const char *insert)
{
string_sub(s, pattern, insert, sizeof(fstring));