 @@ -1,14 +1,14 @@
-/*	$NetBSD: swapctl.c,v 1.35 2009/09/24 16:15:20 apb Exp $	*/
+/*	$NetBSD: swapctl.c,v 1.36 2011/08/27 18:57:50 joerg Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -54,51 +54,51 @@
  *	-p <pri>	use this priority
  *	-c		change priority
+ *
  * or, if invoked as "swapon" (compatibility mode):
+ *
  *	-a		all devices listed as `sw' in /etc/fstab
  *	-t		same as -t above (feature not present in old
  *			swapon(8) command)
  *	<dev>		add this device
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: swapctl.c,v 1.35 2009/09/24 16:15:20 apb Exp $");
+__RCSID("$NetBSD: swapctl.c,v 1.36 2011/08/27 18:57:50 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/swap.h>
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <unistd.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fstab.h>
 #include <fcntl.h>
 #include <util.h>
 #include <paths.h>
 #include "swapctl.h"
-int	command;
+static int	command;
 /*
  * Commands for swapctl(8).  These are mutually exclusive.
  */
 #define	CMD_A		0x01	/* process /etc/fstab for adding */
 #define	CMD_D		0x02	/* set dumpdev */
 #define	CMD_U		0x04	/* process /etc/fstab for removing */
 #define	CMD_a		0x08	/* add a swap file/device */
 #define	CMD_c		0x10	/* change priority of a swap file/device */
 #define	CMD_d		0x20	/* delete a swap file/device */
 #define	CMD_l		0x40	/* list swap files/devices */
 #define	CMD_s		0x80	/* summary of swap files/devices */
 #define	CMD_z		0x100	/* show dump device */
 @@ -111,65 +111,65 @@ do { \
 	command = (cmd); \
 } while (0)
 /*
  * Commands that require a "path" argument at the end of the command
  * line, and the ones which require that none exist.
  */
 #define	REQUIRE_PATH	(CMD_D | CMD_a | CMD_c | CMD_d)
 #define	REQUIRE_NOPATH	(CMD_A | CMD_U | CMD_l | CMD_s | CMD_z | CMD_q)
 /*
  * Option flags, and the commands with which they are valid.
  */
-int	kflag;		/* display in 1K^x blocks */
+static int	kflag;		/* display in 1K^x blocks */
 #define	KFLAG_CMDS	(CMD_l | CMD_s)
 #define MFLAG_CMDS	(CMD_l | CMD_s)
 #define GFLAG_CMDS	(CMD_l | CMD_s)
-int	hflag;		/* display with humanize_number */
+static int	hflag;		/* display with humanize_number */
 #define HFLAG_CMDS	(CMD_l | CMD_s)
-int	pflag;		/* priority was specified */
+static int	pflag;		/* priority was specified */
 #define	PFLAG_CMDS	(CMD_A | CMD_a | CMD_c)
-char	*tflag;		/* swap device type (blk, noblk, auto) */
+static char	*tflag;		/* swap device type (blk, noblk, auto) */
-int	autoflag;	/* 1, if tflag is "auto" */
+static int	autoflag;	/* 1, if tflag is "auto" */
 #define	TFLAG_CMDS	(CMD_A | CMD_U)
-int	fflag;		/* first swap becomes dump */
+static int	fflag;		/* first swap becomes dump */
 #define	FFLAG_CMDS	(CMD_A)
-int	oflag;		/* only autoset dump device */
+static int	oflag;		/* only autoset dump device */
 #define	OFLAG_CMDS	(CMD_A)
-int	nflag;		/* no execute, just print actions */
+static int	nflag;		/* no execute, just print actions */
 #define	NFLAG_CMDS	(CMD_A | CMD_U)
-int	pri;		/* uses 0 as default pri */
+static int	pri;		/* uses 0 as default pri */
 static	void change_priority(char *);
 static	int  add_swap(char *, int);
 static	int  delete_swap(char *);
 static	void set_dumpdev(char *);
 static	int get_dumpdev(void);
-static	void do_fstab(int);
+__dead static	void do_fstab(int);
 static	int check_fstab(void);
 static	void do_localdevs(int);
 static	void do_localdisk(const char *, int);
 static	int do_wedgesofdisk(int fd, int);
 static	int do_partitionsofdisk(const char *, int fd, int);
-static	void usage(void);
+__dead static	void usage(void);
-static	void swapon_command(int, char **);
+__dead static	void swapon_command(int, char **);
 #if 0
 static	void swapoff_command(int, char **);
 #endif
 int
 main(int argc, char *argv[])
+{
 	int	c;
 	if (strcmp(getprogname(), "swapon") == 0) {
 		swapon_command(argc, argv);
 		/* NOTREACHED */
+	}