Rename argpar_iter_get_ingested_orig_args() -> argpar_iter_ingested_orig_args()

Personal preference when naming property getters.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I8bb454da0bc12ce638bdea55d1eb9a4eb3fdfff7

diff --git a/argpar/argpar.c b/argpar/argpar.c
index 5a8a302de8d063dc7ef6426f2be1eb4dfca39793..f324d7fb130355a42ef07583cfcd520f09f2e324 100644 (file)
--- a/argpar/argpar.c
+++ b/argpar/argpar.c
@@ -766,7 +766,7 @@ end:
 }
 
 ARGPAR_HIDDEN
 }
 
 ARGPAR_HIDDEN

-unsigned int argpar_iter_get_ingested_orig_args(
+unsigned int argpar_iter_ingested_orig_args(

                const struct argpar_iter * const iter)
 {
        return iter->i;
                const struct argpar_iter * const iter)
 {
        return iter->i;


@@ -809,7 +809,7 @@ struct argpar_parse_ret argpar_parse(const unsigned int argc,
                case ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT:
                        if (fail_on_unknown_opt) {
                                parse_ret.ingested_orig_args =
                case ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT:
                        if (fail_on_unknown_opt) {
                                parse_ret.ingested_orig_args =

-                                       argpar_iter_get_ingested_orig_args(iter);
+                                       argpar_iter_ingested_orig_args(iter);

                                goto error;
                        }
 
                                goto error;
                        }
 


@@ -832,7 +832,7 @@ struct argpar_parse_ret argpar_parse(const unsigned int argc,
 
 success:
        ARGPAR_ASSERT(!parse_ret.error);
 
 success:
        ARGPAR_ASSERT(!parse_ret.error);

-       parse_ret.ingested_orig_args = argpar_iter_get_ingested_orig_args(iter);
+       parse_ret.ingested_orig_args = argpar_iter_ingested_orig_args(iter);

        goto end;
 
 error:
        goto end;
 
 error:

diff --git a/argpar/argpar.h b/argpar/argpar.h
index 1fb8835f67f6df274c1f1d799f1ad2133f3f0ba0..67056c3aa9834d0af631c0cb3a358bef1bdc7a5b 100644 (file)
--- a/argpar/argpar.h
+++ b/argpar/argpar.h
@@ -362,7 +362,7 @@ enum argpar_iter_next_status argpar_iter_next(
  * the previously returned items.
  */
 ARGPAR_HIDDEN
  * the previously returned items.
  */
 ARGPAR_HIDDEN

-unsigned int argpar_iter_get_ingested_orig_args(const struct argpar_iter *iter);
+unsigned int argpar_iter_ingested_orig_args(const struct argpar_iter *iter);

 
 /*
  * Destroys `item`, as created by argpar_iter_next().
 
 /*
  * Destroys `item`, as created by argpar_iter_next().

diff --git a/tests/test_argpar.c b/tests/test_argpar.c
index f9f8f4991bb7e1eee484067f9ecc0879a9ff5a6a..4882d45c1c0bade6ca1ef0b0ac7ee9ac755f55b0 100644 (file)
--- a/tests/test_argpar.c
+++ b/tests/test_argpar.c
@@ -225,9 +225,9 @@ void test_succeed_argpar_iter(const char * const cmdline,
                append_to_res_str(res_str, item);
        }
 
                append_to_res_str(res_str, item);
        }
 

-       actual_ingested_orig_args = argpar_iter_get_ingested_orig_args(iter);
+       actual_ingested_orig_args = argpar_iter_ingested_orig_args(iter);

        ok(actual_ingested_orig_args == expected_ingested_orig_args,
        ok(actual_ingested_orig_args == expected_ingested_orig_args,

-               "argpar_iter_get_ingested_orig_args() returns the expected "
+               "argpar_iter_ingested_orig_args() returns the expected "

                "number of ingested original arguments for command line `%s`",
                cmdline);
 
                "number of ingested original arguments for command line `%s`",
                cmdline);