jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Build swapon with WARNS=6.

Browse Source 
Don't use a variable called stat, because it collides with stat(2).
This commit is contained in:
Ed Schouten 2011-10-25 17:10:15 +00:00
parent 41f2f866d0
commit ce458f4239
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=226742
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbin/swapon/Makefile
View File

@ -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

10
sbin/swapon/swapon.c
View File

@ -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