diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-09-24 18:57:27 -0700 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-09-24 18:57:27 -0700 |
| commit | bb8a4a9d73915bc35430904bb45318141bb21e22 (patch) | |
| tree | d7f3d4d6dd393060f02f3586da3916175963eacc /source3/lib/util_str.c | |
| parent | df0d629f3726daf71beaa5ec07b284b865adc000 (diff) | |
| parent | 3aa147f8d20bc5124dca1f4746da678a55247b82 (diff) | |
| download | samba-bb8a4a9d73915bc35430904bb45318141bb21e22.tar.gz samba-bb8a4a9d73915bc35430904bb45318141bb21e22.tar.xz samba-bb8a4a9d73915bc35430904bb45318141bb21e22.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index c197fd7515..9a0b12adea 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -1616,7 +1616,7 @@ bool str_list_sub_basic( char **list, const char *smb_name, } /****************************************************************************** - substritute a specific pattern in a string list + substitute a specific pattern in a string list *****************************************************************************/ bool str_list_substitute(char **list, const char *pattern, const char *insert) @@ -2430,13 +2430,13 @@ char *escape_shell_string(const char *src) #define S_LIST_ABS 16 /* List Allocation Block Size */ -char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep) +char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, + const char *sep) { char **list; const char *str; - char *s; + char *s, *tok; int num, lsize; - char *tok; if (!string || !*string) return NULL; |