kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

list-objects-filter-options: always supply *errbuf 

Making errbuf an optional argument complicates error reporting. Fix this
by making all callers supply an errbuf, even if they may ignore it. This
will be important in follow-up patches where the filter-spec parsing has
more pitfalls and possible errors.

Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matthew DeVore 2019-06-27 15:54:07 -07:00 committed by Junio C Hamano
parent 7a7c7f4a6d
commit 842b00516a
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
list-objects-filter-options.c
View File

@ -30,11 +30,8 @@ static int gently_parse_list_objects_filter(
const char *v0; const char *v0;


if (filter_options->choice) { if (filter_options->choice) {
if (errbuf) {
strbuf_addstr( strbuf_addstr(
errbuf, errbuf, _("multiple filter-specs cannot be combined"));
_("multiple filter-specs cannot be combined"));
}
return 1; return 1;
} }


@ -52,11 +49,7 @@ static int gently_parse_list_objects_filter(


} else if (skip_prefix(arg, "tree:", &v0)) { } else if (skip_prefix(arg, "tree:", &v0)) {
if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) { if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) {
if (errbuf) { strbuf_addstr(errbuf, _("expected 'tree:<depth>'"));
strbuf_addstr(
errbuf,
_("expected 'tree:<depth>'"));
}
return 1; return 1;
} }
filter_options->choice = LOFC_TREE_DEPTH; filter_options->choice = LOFC_TREE_DEPTH;
@ -90,7 +83,6 @@ static int gently_parse_list_objects_filter(
* add new filters * add new filters
*/ */


if (errbuf)
strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg); strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);


memset(filter_options, 0, sizeof(*filter_options)); memset(filter_options, 0, sizeof(*filter_options));
@ -175,6 +167,8 @@ void partial_clone_register(
void partial_clone_get_default_filter_spec( void partial_clone_get_default_filter_spec(
struct list_objects_filter_options *filter_options) struct list_objects_filter_options *filter_options)
{ {
struct strbuf errbuf = STRBUF_INIT;

/* /*
* Parse default value, but silently ignore it if it is invalid. * Parse default value, but silently ignore it if it is invalid.
*/ */
@ -182,5 +176,6 @@ void partial_clone_get_default_filter_spec(
return; return;
gently_parse_list_objects_filter(filter_options, gently_parse_list_objects_filter(filter_options,
core_partial_clone_filter_default, core_partial_clone_filter_default,
NULL); &errbuf);
strbuf_release(&errbuf);
} }