From 24066769076ce4b255619ac4e77019ed1c199764 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 3 Jan 2023 05:59:07 +0000 Subject: [PATCH] Don't use array size in function arguments The declaration of argv_to_string() mismatched its definition. The definition had the array size, the declaration had not. Remove array sizes from all functions declared in argv.h. Array sizes in function arguments don't ensure the code correctness but can give a wrong impression that the compiler would check the array size. --- include/tig/argv.h | 6 +++--- src/argv.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/tig/argv.h b/include/tig/argv.h index d4441d57f..347a6333a 100644 --- a/include/tig/argv.h +++ b/include/tig/argv.h @@ -25,9 +25,9 @@ bool argv_to_string(const char *argv[], char *buf, size_t buflen, const char *sep); char *argv_to_string_alloc(const char *argv[], const char *sep); -bool argv_to_string_quoted(const char *argv[SIZEOF_ARG], char *buf, size_t buflen, const char *sep); -bool argv_from_string_no_quotes(const char *argv[SIZEOF_ARG], int *argc, char *cmd); -bool argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd); +bool argv_to_string_quoted(const char *argv[], char *buf, size_t buflen, const char *sep); +bool argv_from_string_no_quotes(const char *argv[], int *argc, char *cmd); +bool argv_from_string(const char *argv[], int *argc, char *cmd); void argv_free(const char *argv[]); size_t argv_size(const char **argv); bool argv_append(const char ***argv, const char *arg); diff --git a/src/argv.c b/src/argv.c index b170dbceb..032b0705b 100644 --- a/src/argv.c +++ b/src/argv.c @@ -72,13 +72,13 @@ argv_to_string_alloc(const char *argv[], const char *sep) } bool -argv_to_string_quoted(const char *argv[SIZEOF_ARG], char *buf, size_t buflen, const char *sep) +argv_to_string_quoted(const char *argv[], char *buf, size_t buflen, const char *sep) { return concat_argv(argv, buf, buflen, sep, true); } bool -argv_to_string(const char *argv[SIZEOF_ARG], char *buf, size_t buflen, const char *sep) +argv_to_string(const char *argv[], char *buf, size_t buflen, const char *sep) { return concat_argv(argv, buf, buflen, sep, false); } @@ -144,7 +144,7 @@ parse_arg(char **cmd, bool remove_quotes) } static bool -split_argv_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd, bool remove_quotes) +split_argv_string(const char *argv[], int *argc, char *cmd, bool remove_quotes) { while (*cmd && *argc < SIZEOF_ARG) { char *arg = parse_arg(&cmd, remove_quotes); @@ -161,13 +161,13 @@ split_argv_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd, bool remov } bool -argv_from_string_no_quotes(const char *argv[SIZEOF_ARG], int *argc, char *cmd) +argv_from_string_no_quotes(const char *argv[], int *argc, char *cmd) { return split_argv_string(argv, argc, cmd, true); } bool -argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd) +argv_from_string(const char *argv[], int *argc, char *cmd) { return split_argv_string(argv, argc, cmd, false); }