diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:51:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:51:18 -0700 |
| commit | 6f75e48323bc3071495025fd14105e9dffa9e8dd (patch) | |
| tree | fbb3b54f3877d21bc6a9ac6c284971581e18274b /parse-options.c | |
| parent | 884377c128925e7aa43eafebd8d4d0ba27dafe67 (diff) | |
| parent | 2c5495f7b60d6ddcd6a411b48d2f6dbc4a24717a (diff) | |
| download | git-6f75e48323bc3071495025fd14105e9dffa9e8dd.tar.gz | |
Merge branch 'rm/strchrnul-not-strlen'
* rm/strchrnul-not-strlen:
use strchrnul() in place of strchr() and strlen()
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/parse-options.c b/parse-options.c index 7b8d3faa17..a5fa0b8938 100644 --- a/parse-options.c +++ b/parse-options.c @@ -223,13 +223,10 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, const struct option *options) { const struct option *all_opts = options; - const char *arg_end = strchr(arg, '='); + const char *arg_end = strchrnul(arg, '='); const struct option *abbrev_option = NULL, *ambiguous_option = NULL; int abbrev_flags = 0, ambiguous_flags = 0; - if (!arg_end) - arg_end = arg + strlen(arg); - for (; options->type != OPTION_END; options++) { const char *rest, *long_name = options->long_name; int flags = 0, opt_flags = 0; |