From eac14234c83b926c4208ff625f2782371cfd0baa Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 2 Feb 2021 11:05:47 +0100 Subject: [PATCH] vsh: Prefer g_strdup_printf() over g_snprintf() in vshReadlineOptionsGenerator() The vshReadlineOptionsGenerator() function returns a string list of all --options for given command. But the way that individual items on the list are allocated can be written better. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma --- tools/vsh.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 2df3b0741a..201b7ba6d1 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2627,7 +2627,6 @@ vshReadlineOptionsGenerator(const char *text, const char *name = cmd->opts[list_index].name; bool exists = false; vshCmdOpt *opt = last->opts; - size_t name_len; /* Skip aliases, we do not report them in help output either. */ if (cmd->opts[list_index].type == VSH_OT_ALIAS) @@ -2660,9 +2659,7 @@ vshReadlineOptionsGenerator(const char *text, return NULL; } - name_len = strlen(name); - ret[ret_size] = g_new0(char, name_len + 3); - g_snprintf(ret[ret_size], name_len + 3, "--%s", name); + ret[ret_size] = g_strdup_printf("--%s", name); ret_size++; /* Terminate the string list properly. */ ret[ret_size] = NULL;