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 /sys-utils/swapon.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 '')
-rw-r--r-- | sys-utils/swapon.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 8735549..ce499c1 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -1,3 +1,16 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Copyright (C) 2012-2023 Karel Zak <kzak@redhat.com> + * + * Original implementation from Linux 0.99, without License and copyright in + * the code. Karel Zak rewrote the code under GPL-2.0-or-later. + */ #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -77,10 +90,10 @@ 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; }; enum { @@ -92,7 +105,7 @@ enum { COL_UUID, COL_LABEL }; -static struct colinfo infos[] = { +static const struct colinfo infos[] = { [COL_PATH] = { "NAME", 0.20, 0, N_("device file or partition path") }, [COL_TYPE] = { "TYPE", 0.20, SCOLS_FL_TRUNC, N_("type of the device")}, [COL_SIZE] = { "SIZE", 0.20, SCOLS_FL_RIGHT, N_("size of the swap area")}, @@ -159,7 +172,7 @@ static inline int get_column_id(const struct swapon_ctl *ctl, int num) return ctl->columns[num]; } -static inline struct colinfo *get_column_info(const struct swapon_ctl *ctl, unsigned num) +static inline const struct colinfo *get_column_info(const struct swapon_ctl *ctl, unsigned num) { return &infos[get_column_id(ctl, num)]; } @@ -299,7 +312,7 @@ static int show_table(struct swapon_ctl *ctl) scols_table_enable_noheadings(table, ctl->no_heading); for (i = 0; i < ctl->ncolumns; i++) { - struct colinfo *col = get_column_info(ctl, i); + const struct colinfo *col = get_column_info(ctl, i); if (!scols_table_new_column(table, col->name, col->whint, col->flags)) err(EXIT_FAILURE, _("failed to allocate output column")); @@ -825,7 +838,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - printf(USAGE_HELP_OPTIONS(26)); + fprintf(out, USAGE_HELP_OPTIONS(26)); fputs(_("\nThe <spec> parameter:\n" \ " -L <label> synonym for LABEL=<label>\n" @@ -846,7 +859,7 @@ static void __attribute__((__noreturn__)) usage(void) for (i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %-5s %s\n", infos[i].name, _(infos[i].help)); - printf(USAGE_MAN_TAIL("swapon(8)")); + fprintf(out, USAGE_MAN_TAIL("swapon(8)")); exit(EXIT_SUCCESS); } |