[PATCH] swapon: Make needlessly global variables static

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Also constify the option array.

Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
---
 mount/swapon.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mount/swapon.c b/mount/swapon.c
index e9ccc94..2c0dd9f 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);
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux