From: Masatake YAMATO Date: Tue, 24 Oct 2023 16:41:58 +0000 (+0900) Subject: Use fputs instead of fprintf if possible X-Git-Tag: v2.40-rc1~177^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38b8eac6eb9a372e0a2b9c8f2b4abb816c6f17ee;p=thirdparty%2Futil-linux.git Use fputs instead of fprintf if possible Signed-off-by: Masatake YAMATO --- diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c index a1b6a844d4..4080b757d3 100644 --- a/disk-utils/fdisk-list.c +++ b/disk-utils/fdisk-list.c @@ -439,7 +439,7 @@ void list_available_columns(FILE *out) termwidth = get_terminal_width(80); - fprintf(out, USAGE_COLUMNS); + fputs(USAGE_COLUMNS, out); while (fdisk_next_label(cxt, &lb) == 0) { size_t width = 6; /* label name and separators */ @@ -543,4 +543,3 @@ done: *n = fields_nids; return fields_ids; } - diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c index 5ca2cd09be..da26b6063d 100644 --- a/misc-utils/fincore.c +++ b/misc-utils/fincore.c @@ -407,7 +407,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_SEPARATOR, out); printf(USAGE_HELP_OPTIONS(23)); - fprintf(out, USAGE_COLUMNS); + fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %22s %s\n", infos[i].name, _(infos[i].help)); diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 96d118189a..d5012de8a9 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -2018,7 +2018,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_SEPARATOR, out); printf(USAGE_HELP_OPTIONS(22)); - fprintf(out, USAGE_COLUMNS); + fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %12s %s\n", infos[i].name, _(infos[i].help)); diff --git a/misc-utils/lsclocks.c b/misc-utils/lsclocks.c index 8bdfd5ed46..aae31e574f 100644 --- a/misc-utils/lsclocks.c +++ b/misc-utils/lsclocks.c @@ -195,7 +195,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_SEPARATOR, out); printf(USAGE_HELP_OPTIONS(29)); - fprintf(out, USAGE_COLUMNS); + fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %16s %-10s%s\n", infos[i].name, diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 921216235d..862a0d4e0b 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -1764,7 +1764,7 @@ static void collect_processes(struct lsfd_control *ctl, const pid_t pids[], int static void __attribute__((__noreturn__)) list_colunms(FILE *out) { - fprintf(out, USAGE_COLUMNS); + fputs(USAGE_COLUMNS, out); for (size_t i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %20s %-10s%s\n", infos[i].name, infos[i].json_type == SCOLS_JSON_STRING? "":