[PATCH v5 10/10] list-objects-filter-options: make parser void

[Matthew DeVore]

This function always returns 0, so make it return void instead.

Signed-off-by: Matthew DeVore <matv...@google.com>
---
 list-objects-filter-options.c | 12 +++++-------
 list-objects-filter-options.h |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 44bc1153d1..ba1425cb4a 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -225,21 +225,21 @@ static void transform_to_combine_type(
        string_list_clear(&filter_options->sub[0].filter_spec, /*free_util=*/0);
 }
 
 void list_objects_filter_die_if_populated(
        struct list_objects_filter_options *filter_options)
 {
        if (filter_options->choice)
                die(_("multiple filter-specs cannot be combined"));
 }
 
-int parse_list_objects_filter(
+void parse_list_objects_filter(
        struct list_objects_filter_options *filter_options,
        const char *arg)
 {
        struct strbuf errbuf = STRBUF_INIT;
        int parse_error;
 
        if (!filter_options->choice) {
                string_list_append(&filter_options->filter_spec, xstrdup(arg));
 
                parse_error = gently_parse_list_objects_filter(
@@ -255,34 +255,32 @@ int parse_list_objects_filter(
                filter_spec_append_urlencode(filter_options, arg);
                ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
                              filter_options->sub_alloc);
 
                parse_error = gently_parse_list_objects_filter(
                        &filter_options->sub[filter_options->sub_nr - 1], arg,
                        &errbuf);
        }
        if (parse_error)
                die("%s", errbuf.buf);
-       return 0;
 }
 
 int opt_parse_list_objects_filter(const struct option *opt,
                                  const char *arg, int unset)
 {
        struct list_objects_filter_options *filter_options = opt->value;
 
-       if (unset || !arg) {
+       if (unset || !arg)
                list_objects_filter_set_no_filter(filter_options);
-               return 0;
-       }
-
-       return parse_list_objects_filter(filter_options, arg);
+       else
+               parse_list_objects_filter(filter_options, arg);
+       return 0;
 }
 
 const char *list_objects_filter_spec(struct list_objects_filter_options 
*filter)
 {
        if (!filter->filter_spec.nr)
                BUG("no filter_spec available for this filter");
        if (filter->filter_spec.nr != 1) {
                struct strbuf concatted = STRBUF_INIT;
                strbuf_add_separated_string_list(
                        &concatted, "", &filter->filter_spec);
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index d8bc7e946e..db37dfb34a 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -67,21 +67,21 @@ void list_objects_filter_die_if_populated(
        struct list_objects_filter_options *filter_options);
 
 /*
  * Parses the filter spec string given by arg and either (1) simply places the
  * result in filter_options if it is not yet populated or (2) combines it with
  * the filter already in filter_options if it is already populated. In the case
  * of (2), the filter specs are combined as if specified with 'combine:'.
  *
  * Dies and prints a user-facing message if an error occurs.
  */
-int parse_list_objects_filter(
+void parse_list_objects_filter(
        struct list_objects_filter_options *filter_options,
        const char *arg);
 
 int opt_parse_list_objects_filter(const struct option *opt,
                                  const char *arg, int unset);
 
 #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
        { OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \
          N_("object filtering"), 0, \
          opt_parse_list_objects_filter }
-- 
2.21.0