diff options
| author | Johan Karlsson <johan@FreeBSD.org> | 2003-08-07 19:10:35 +0000 |
|---|---|---|
| committer | Johan Karlsson <johan@FreeBSD.org> | 2003-08-07 19:10:35 +0000 |
| commit | 7f1740e82abec77d84b5be590a2039930770d38a (patch) | |
| tree | 55fcac51c8fffc5af6a6c95bcb20c727a14c9630 /sbin | |
| parent | c8aacbdaa840f0ac07f3226c254f388e8bbce799 (diff) | |
| download | src-7f1740e82abec77d84b5be590a2039930770d38a.tar.gz src-7f1740e82abec77d84b5be590a2039930770d38a.zip | |
Make this WARNS=6 clean by renaming the variable 'err' to 'error'
in order not to shadow err(3).
Tested by: make universe
Notes
Notes:
svn path=/head/; revision=118632
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ccdconfig/Makefile | 2 | ||||
| -rw-r--r-- | sbin/ccdconfig/ccdconfig.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile index 6d6e7e096ca0..ac7558409ed6 100644 --- a/sbin/ccdconfig/Makefile +++ b/sbin/ccdconfig/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ccdconfig -WARNS?= 3 +WARNS?= 6 MAN= ccdconfig.8 DPADD= ${LIBGEOM} diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index 21833e6266ec..c7baa9826c82 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -380,16 +380,16 @@ dumpout(int unit) static int dump_ccd(int argc, char **argv) { - int i, err; + int i, error; if (argc == 0) { - err = dumpout(-1); + error = dumpout(-1); } else { - err = 0; - for (i = 0; err == 0 && i < argc; i++) - err = dumpout(resolve_ccdname(argv[i])); + error = 0; + for (i = 0; error == 0 && i < argc; i++) + error = dumpout(resolve_ccdname(argv[i])); } - return (err); + return (error); } static int |