From 16ff981363ca4b817276074b0684de910d1ef867 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 21 Jan 2011 16:44:18 +0100 Subject: [PATCH] swapon: make needlessly global variables static Also constify the option array. Signed-off-by: Tobias Klauser --- mount/swapon.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mount/swapon.c b/mount/swapon.c index e9ccc94a..2c0dd9fa 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -58,18 +58,18 @@ enum { #define SWAP_SIGNATURE "SWAPSPACE2" #define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1) -int all; -int priority = -1; /* non-prioritized swap by default */ -int discard; +static int all; +static int priority = -1; /* non-prioritized swap by default */ +static int discard; /* If true, don't complain if the device/file doesn't exist */ -int ifexists; -int fixpgsz; +static int ifexists; +static int fixpgsz; -int verbose; -char *progname; +static int verbose; +static char *progname; -static struct option longswaponopts[] = { +static const struct option longswaponopts[] = { /* swapon only */ { "priority", required_argument, 0, 'p' }, { "discard", 0, 0, 'd' }, @@ -84,7 +84,7 @@ static struct option longswaponopts[] = { { NULL, 0, 0, 0 } }; -static struct option *longswapoffopts = &longswaponopts[4]; +static const struct option *longswapoffopts = &longswaponopts[4]; static int cannot_find(const char *special); -- 2.39.5