diff options
| author | Volker Lendecke <vl@samba.org> | 2011-03-09 16:34:49 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-04-13 14:13:25 -0700 |
| commit | 4be643d4ce33d5ce2bf9deacc3f6d0fde90cf626 (patch) | |
| tree | 67c1e89421337550501ad07a24e39220c6287285 /lib/util/charset | |
| parent | cfe30df98ea9ca3360d3cfd8b850c5910c1cd165 (diff) | |
| download | samba-4be643d4ce33d5ce2bf9deacc3f6d0fde90cf626.tar.gz samba-4be643d4ce33d5ce2bf9deacc3f6d0fde90cf626.tar.bz2 samba-4be643d4ce33d5ce2bf9deacc3f6d0fde90cf626.zip | |
lib: Move next_token next to next_token_talloc
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/util/charset')
| -rw-r--r-- | lib/util/charset/util_unistr.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c index 6737256a95..ddb15f88f9 100644 --- a/lib/util/charset/util_unistr.c +++ b/lib/util/charset/util_unistr.c @@ -22,53 +22,6 @@ #include "system/locale.h" /** - * Get the next token from a string, return False if none found. - * Handles double-quotes. - * - * Based on a routine by GJC@VILLAGE.COM. - * Extensively modified by Andrew.Tridgell@anu.edu.au - **/ -_PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bufsize) -{ - const char *s; - bool quoted; - size_t len=1; - - if (!ptr) - return false; - - s = *ptr; - - /* default to simple separators */ - if (!sep) - sep = " \t\n\r"; - - /* find the first non sep char */ - while (*s && strchr_m(sep,*s)) - s++; - - /* nothing left? */ - if (!*s) - return false; - - /* copy over the token */ - for (quoted = false; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) { - if (*s == '\"') { - quoted = !quoted; - } else { - len++; - *buff++ = *s; - } - } - - *ptr = (*s) ? s+1 : s; - *buff = 0; - - return true; -} - - -/** String replace. NOTE: oldc and newc must be 7 bit characters **/ |