diff options
| author | ed <ed@FreeBSD.org> | 2011-10-25 17:10:15 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2011-10-25 17:10:15 +0000 |
| commit | f1b63119c2457e4abefb1aa803be96e11707f401 (patch) | |
| tree | 96ac46995bf1d35124364e028061cce8d1c3cb34 | |
| parent | 42dab25a22b51e2f6352c24210a39ea37ecee0fe (diff) | |
| download | FreeBSD-src-f1b63119c2457e4abefb1aa803be96e11707f401.zip FreeBSD-src-f1b63119c2457e4abefb1aa803be96e11707f401.tar.gz | |
Build swapon with WARNS=6.
Don't use a variable called stat, because it collides with stat(2).
| -rw-r--r-- | sbin/swapon/Makefile | 1 | ||||
| -rw-r--r-- | sbin/swapon/swapon.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 7442281..6f8e8df 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -8,7 +8,6 @@ LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 -WARNS?= 3 DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 5e85602..ed13dc5 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -67,7 +67,7 @@ main(int argc, char **argv) { struct fstab *fsp; char *ptr; - int stat; + int ret; int ch, doall; int sflag = 0, lflag = 0, hflag = 0, qflag = 0; const char *etc_fstab; @@ -144,7 +144,7 @@ main(int argc, char **argv) } argv += optind; - stat = 0; + ret = 0; if (etc_fstab != NULL) setfstab(etc_fstab); if (which_prog == SWAPON || which_prog == SWAPOFF) { @@ -155,7 +155,7 @@ main(int argc, char **argv) if (strstr(fsp->fs_mntops, "noauto")) continue; if (swap_on_off(fsp->fs_spec, 1)) { - stat = 1; + ret = 1; } else { if (!qflag) { printf("%s: %sing %s as swap device\n", @@ -170,7 +170,7 @@ main(int argc, char **argv) usage(); for (; *argv; ++argv) { if (swap_on_off(*argv, 0)) { - stat = 1; + ret = 1; } else if (orig_prog == SWAPCTL) { printf("%s: %sing %s as swap device\n", getprogname(), which_prog == SWAPOFF ? "remov" : "add", @@ -183,7 +183,7 @@ main(int argc, char **argv) else usage(); } - exit(stat); + exit(ret); } static int |
