diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
| commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
| tree | 1fdda006866bca20d41cb206767ea5241e36852f /disk-utils/partx.c | |
| parent | Adding debian version 2.39.3-11. (diff) | |
| download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip | |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'disk-utils/partx.c')
| -rw-r--r-- | disk-utils/partx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/disk-utils/partx.c b/disk-utils/partx.c index 8078e9c..b0d552c 100644 --- a/disk-utils/partx.c +++ b/disk-utils/partx.c @@ -82,14 +82,14 @@ enum { /* column names */ struct colinfo { - const char *name; /* header */ - double whint; /* width hint (N < 1 is in percent of termwidth) */ - int flags; /* SCOLS_FL_* */ - const char *help; + const char * const name; /* header */ + double whint; /* width hint (N < 1 is in percent of termwidth) */ + int flags; /* SCOLS_FL_* */ + const char *help; }; /* columns descriptions */ -static struct colinfo infos[] = { +static const struct colinfo infos[] = { [COL_PARTNO] = { "NR", 0.25, SCOLS_FL_RIGHT, N_("partition number") }, [COL_START] = { "START", 0.30, SCOLS_FL_RIGHT, N_("start of the partition in sectors") }, [COL_END] = { "END", 0.30, SCOLS_FL_RIGHT, N_("end of the partition in sectors") }, @@ -148,7 +148,7 @@ static inline int get_column_id(int num) return columns[num]; } -static inline struct colinfo *get_column_info(int num) +static inline const struct colinfo *get_column_info(int num) { return &infos[ get_column_id(num) ]; } @@ -681,7 +681,7 @@ static int show_parts(blkid_partlist ls, int scols_flags, int lower, int upper) scols_table_enable_noheadings(table, !!(scols_flags & PARTX_NOHEADINGS)); for (i = 0; (size_t)i < ncolumns; i++) { - struct colinfo *col = get_column_info(i); + const struct colinfo *col = get_column_info(i); if (!scols_table_new_column(table, col->name, col->whint, col->flags)) { warnx(_("failed to allocate output column")); @@ -783,13 +783,13 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - printf(USAGE_HELP_OPTIONS(22)); + fprintf(out, USAGE_HELP_OPTIONS(22)); fputs(USAGE_COLUMNS, out); for (i = 0; i < NCOLS; i++) fprintf(out, " %10s %s\n", infos[i].name, _(infos[i].help)); - printf(USAGE_MAN_TAIL("partx(8)")); + fprintf(out, USAGE_MAN_TAIL("partx(8)")); exit(EXIT_SUCCESS); } |