diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-05-25 22:31:07 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-06-06 18:16:12 +0200 |
| commit | 0a334343d14ee8c49f561e7e3c8def1dda93e8db (patch) | |
| tree | 6a9e3a19019b7f7f4e845739d4f8d36223837389 /lib/frrstr.c | |
| parent | vtysh: add | support (diff) | |
| download | frr-0a334343d14ee8c49f561e7e3c8def1dda93e8db.tar.xz frr-0a334343d14ee8c49f561e7e3c8def1dda93e8db.zip | |
*: style for | support
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/frrstr.c')
| -rw-r--r-- | lib/frrstr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/frrstr.c b/lib/frrstr.c index b527827b3..03368b366 100644 --- a/lib/frrstr.c +++ b/lib/frrstr.c @@ -40,6 +40,7 @@ void frrstr_split(const char *string, const char *delimiter, char ***result, *argc = 0; const char *tok = NULL; + while (copy) { tok = strsep(©, delimiter); (*result)[idx] = XSTRDUP(MTYPE_TMP, tok); @@ -50,8 +51,6 @@ void frrstr_split(const char *string, const char *delimiter, char ***result, } XFREE(MTYPE_TMP, copystart); - - return; } vector frrstr_split_vec(const char *string, const char *delimiter) @@ -62,7 +61,9 @@ vector frrstr_split_vec(const char *string, const char *delimiter) frrstr_split(string, delimiter, &result, &argc); vector v = array_to_vector((void **)result, argc); + XFREE(MTYPE_TMP, result); + return v; } @@ -85,6 +86,7 @@ char *frrstr_join(const char **parts, int argc, const char *join) for (i = 0; i < argc; i++) { size_t arglen = strlen(parts[i]); + memcpy(p, parts[i], arglen); p += arglen; if (i + 1 != argc) { @@ -115,6 +117,7 @@ char *frrstr_join_vec(vector v, const char *join) void frrstr_filter_vec(vector v, regex_t *filter) { regmatch_t ignored[1]; + for (unsigned int i = 0; i < vector_active(v); i++) { if (regexec(filter, vector_slot(v, i), 0, ignored, 0)) { XFREE(MTYPE_TMP, vector_slot(v, i)); @@ -143,9 +146,12 @@ bool begins_with(const char *str, const char *prefix) { if (!str || !prefix) return 0; + size_t lenstr = strlen(str); size_t lenprefix = strlen(prefix); + if (lenprefix > lenstr) return 0; + return strncmp(str, prefix, lenprefix) == 0; } |