[PATCH v1 07/48] tools subcmd: Silence -Wshorten-64-to-32 warnings

Ian Rogers
2025-04-01T18:24:51Z

Move mput_char out of header file to its only use in help.c, while
changing its argument types.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/subcmd/help.c | 28 ++++++++++++++++------------
tools/lib/subcmd/help.h | 6 ------
tools/lib/subcmd/parse-options.c | 16 ++++++++--------
3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/tools/lib/subcmd/help.c b/tools/lib/subcmd/help.c
index 8561b0f01a24..555b91ada0f9 100644
--- a/tools/lib/subcmd/help.c
+++ b/tools/lib/subcmd/help.c
@@ -125,13 +125,11 @@ static void get_term_dimensions(struct winsize *ws)
ws->ws_col = 80;
}

-static void pretty_print_string_list(struct cmdnames *cmds, int longest)
+static void pretty_print_string_list(struct cmdnames *cmds, size_t longest)
{
- int cols = 1, rows;
- int space = longest + 1; /* min 1 SP between words */
+ size_t cols = 1, rows, max_cols;
+ size_t space = longest + 1; /* min 1 SP between words */
struct winsize win;
- int max_cols;
- int i, j;

get_term_dimensions(&win);
max_cols = win.ws_col - 1; /* don't print *on* the edge */
@@ -140,12 +138,12 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest)
cols = max_cols / space;
rows = (cmds->cnt + cols - 1) / cols;

- for (i = 0; i < rows; i++) {
+ for (size_t i = 0; i < rows; i++) {
printf(" ");

- for (j = 0; j < cols; j++) {
- unsigned int n = j * rows + i;
- unsigned int size = space;
+ for (size_t j = 0; j < cols; j++) {
+ size_t n = j * rows + i;
+ int size = (int)space;

if (n >= cmds->cnt)
break;
@@ -180,7 +178,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
const char *path,
const char *prefix)
{
- int prefix_len;
+ size_t prefix_len;
DIR *dir = opendir(path);
struct dirent *de;
char *buf = NULL;
@@ -194,7 +192,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
astrcatf(&buf, "%s/", path);

while ((de = readdir(dir)) != NULL) {
- int entlen;
+ size_t entlen;

if (!strstarts(de->d_name, prefix))
continue;
@@ -250,10 +248,16 @@ void load_command_list(const char *prefix,
exclude_cmds(other_cmds, main_cmds);
}

+static void mput_char(char c, size_t num)
+{
+ while (num--)
+ putchar(c);
+}
+
void list_commands(const char *title, struct cmdnames *main_cmds,
struct cmdnames *other_cmds)
{
- unsigned int i, longest = 0;
+ size_t i, longest = 0;

for (i = 0; i < main_cmds->cnt; i++)
if (longest < main_cmds->names[i]->len)
diff --git a/tools/lib/subcmd/help.h b/tools/lib/subcmd/help.h
index 355c066c8d49..258b3a143cbc 100644
--- a/tools/lib/subcmd/help.h
+++ b/tools/lib/subcmd/help.h
@@ -14,12 +14,6 @@ struct cmdnames {
} **names;
};

-static inline void mput_char(char c, unsigned int num)
-{
- while(num--)
- putchar(c);
-}
-
void load_command_list(const char *prefix,
struct cmdnames *main_cmds,
struct cmdnames *other_cmds);
diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c
index 555d617c1f50..add46b81a131 100644
--- a/tools/lib/subcmd/parse-options.c
+++ b/tools/lib/subcmd/parse-options.c
@@ -201,7 +201,7 @@ static int get_value(struct parse_opt_ctx_t *p,
return 0;

case OPTION_SET_UINT:
- *(unsigned int *)opt->value = unset ? 0 : opt->defval;
+ *(unsigned int *)opt->value = unset ? 0 : (unsigned int)opt->defval;
return 0;

case OPTION_SET_PTR:
@@ -256,12 +256,12 @@ static int get_value(struct parse_opt_ctx_t *p,
return 0;
}
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
- *(int *)opt->value = opt->defval;
+ *(int *)opt->value = (int)opt->defval;
return 0;
}
if (get_arg(p, opt, flags, &arg))
return -1;
- *(int *)opt->value = strtol(arg, (char **)&s, 10);
+ *(int *)opt->value = (int)strtol(arg, (char **)&s, 10);
if (*s)
return opterror(opt, "expects a numerical value", flags);
return 0;
@@ -272,14 +272,14 @@ static int get_value(struct parse_opt_ctx_t *p,
return 0;
}
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
- *(unsigned int *)opt->value = opt->defval;
+ *(unsigned int *)opt->value = (unsigned int)opt->defval;
return 0;
}
if (get_arg(p, opt, flags, &arg))
return -1;
if (arg[0] == '-')
return opterror(opt, "expects an unsigned numerical value", flags);
- *(unsigned int *)opt->value = strtol(arg, (char **)&s, 10);
+ *(unsigned int *)opt->value = (unsigned int)strtol(arg, (char **)&s, 10);
if (*s)
return opterror(opt, "expects a numerical value", flags);
return 0;
@@ -770,9 +770,9 @@ static void print_option_help(const struct option *opts, int full)
break;
}

- if (pos <= USAGE_OPTS_WIDTH)
- pad = USAGE_OPTS_WIDTH - pos;
- else {
+ if (pos <= USAGE_OPTS_WIDTH) {
+ pad = (int)(USAGE_OPTS_WIDTH - pos);
+ } else {
fputc('\n', stderr);
pad = USAGE_OPTS_WIDTH;
}
--
2.49.0.504.g3bcea36a83-goog