From 8af0d62318c12700a3d4056cf5cc8af90bbc14c6 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 4 Feb 2004 17:40:01 +0000 Subject: [PATCH] Fix various warnings. Patch submitted by Simon "corecode" Schubert. --- sbin/atm/fore_dnld/fore_dnld.c | 10 ++-- sbin/dmesg/dmesg.c | 4 +- sbin/dump/dump.h | 3 +- sbin/dump/main.c | 14 +++--- sbin/dump/tape.c | 6 +-- sbin/dump/traverse.c | 6 +-- sbin/fsck/dir.c | 4 +- sbin/fsck/inode.c | 6 +-- sbin/fsck/main.c | 3 +- sbin/fsck/pass2.c | 8 +-- sbin/fsck/pass3.c | 6 +-- sbin/fsck/preen.c | 6 +-- sbin/fsck/utilities.c | 6 ++- sbin/fsdb/fsdbutil.c | 4 +- sbin/i386/nextboot/nextboot.c | 3 +- sbin/ifconfig/ifconfig.c | 4 +- sbin/ip6fw/ip6fw.c | 8 +-- sbin/ipfw/ipfw.c | 8 +-- sbin/kget/kget.c | 4 +- sbin/kldunload/kldunload.c | 4 +- sbin/mount_nfs/mount_nfs.c | 3 +- sbin/mount_portal/pt_tcplisten.c | 4 +- sbin/mount_umap/mount_umap.c | 3 +- sbin/mountd/mountd.c | 16 +++--- sbin/newfs/fscopy.c | 4 +- sbin/newfs/mkfs.c | 4 +- sbin/newfs/newfs.c | 11 +++-- sbin/nfsd/nfsd.c | 6 +-- sbin/ping6/ping6.c | 4 +- sbin/rcorder/rcorder.c | 4 +- sbin/restore/dirs.c | 8 +-- sbin/restore/interactive.c | 6 +-- sbin/restore/tape.c | 14 +++--- sbin/route/route.c | 5 +- sbin/routed/radix.c | 6 +-- sbin/routed/radix.h | 4 +- sbin/routed/table.c | 4 +- sbin/savecore/savecore.c | 8 +-- sbin/sysctl/sysctl.c | 18 +++---- sbin/vinum/commands.c | 84 ++++++++++++++++++-------------- sbin/vinum/list.c | 32 ++++++------ 41 files changed, 195 insertions(+), 170 deletions(-) diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c index 1eeed269a9..3cf94cbcf7 100644 --- a/sbin/atm/fore_dnld/fore_dnld.c +++ b/sbin/atm/fore_dnld/fore_dnld.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.6.2.2 2000/12/11 01:03:24 obrien Exp $ - * @(#) $DragonFly: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.4 2003/09/28 14:39:16 hmp Exp $ + * @(#) $DragonFly: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.5 2004/02/04 17:39:58 joerg Exp $ */ /* @@ -97,6 +97,8 @@ int lineptr = 0; Mon960 *Uart; +int sendbinfile(char *, u_char *); + void delay(cnt) int cnt; @@ -666,8 +668,6 @@ loadmicrocode ( u_char *ucode, int size, u_char *ram ) char c[4]; } w1, w2; #endif - int n; - int cnt = 0; u_char *bufp; u_long *lp; @@ -1315,7 +1315,7 @@ main( int argc, char **argv ) hb3 = CP_READ(Mon->mon_bstat); if (hb3 != BOOT_RUNNING) { if (verbose) - printf("bstat %x\n", hb3); + printf("bstat %lx\n", hb3); continue; } @@ -1323,7 +1323,7 @@ main( int argc, char **argv ) delay(1); hb2 = CP_READ(aap->aali_heartbeat); if (verbose) - printf("hb %x %x\n", hb1, hb2); + printf("hb %lx %lx\n", hb1, hb2); if (hb1 < hb2) break; } diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 0697d9a52b..f5f15ab861 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)dmesg.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/dmesg/dmesg.c,v 1.11.2.3 2001/08/08 22:32:15 obrien Exp $ - * $DragonFly: src/sbin/dmesg/dmesg.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/dmesg/dmesg.c,v 1.5 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -71,7 +71,7 @@ main(int argc, char **argv) kvm_t *kd; char buf[5]; int all = 0; - int pri; + int pri = 0; size_t buflen; int bufpos; diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index dcc17d8db8..827a1c4d5b 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -33,7 +33,7 @@ * @(#)dump.h 8.2 (Berkeley) 4/28/95 * * $FreeBSD: src/sbin/dump/dump.h,v 1.7.6.4 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/dump.h,v 1.4 2003/11/03 19:51:04 eirikn Exp $ + * $DragonFly: src/sbin/dump/dump.h,v 1.5 2004/02/04 17:39:59 joerg Exp $ */ #define MAXINOPB (MAXBSIZE / sizeof(struct dinode)) @@ -112,6 +112,7 @@ int mapdirs(ino_t maxino, long *tapesize); /* file dumping routines */ void blksout(daddr_t *blkp, int frags, ino_t ino); void bread(daddr_t blkno, char *buf, int size); +ssize_t cread(int fd, void *buf, size_t nbytes, off_t offset); void dumpino(struct dinode *dp, ino_t ino); void dumpmap(char *map, int type, ino_t ino); void writeheader(ino_t ino); diff --git a/sbin/dump/main.c b/sbin/dump/main.c index ed27a7dd1d..42de4b2bd3 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/main.c,v 1.20.2.9 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/main.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/dump/main.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -339,7 +339,7 @@ main(int argc, char **argv) dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1); dev_bshift = ffs(dev_bsize) - 1; if (dev_bsize != (1 << dev_bshift)) - quit("dev_bsize (%d) is not a power of 2", dev_bsize); + quit("dev_bsize (%ld) is not a power of 2", dev_bsize); tp_bshift = ffs(TP_BSIZE) - 1; if (TP_BSIZE != (1 << tp_bshift)) quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE); @@ -474,23 +474,23 @@ main(int argc, char **argv) (void)dumpino(dp, ino); } - (void)time((time_t *)&(tend_writing)); + time(&tend_writing); spcl.c_type = TS_END; for (i = 0; i < ntrec; i++) writeheader(maxino - 1); if (pipeout) - msg("DUMP: %ld tape blocks\n", spcl.c_tapea); + msg("DUMP: %ld tape blocks\n", (long)spcl.c_tapea); else msg("DUMP: %ld tape blocks on %d volume%s\n", - spcl.c_tapea, spcl.c_volume, + (long)spcl.c_tapea, spcl.c_volume, (spcl.c_volume == 1) ? "" : "s"); /* report dump performance, avoid division through zero */ if (tend_writing - tstart_writing == 0) msg("finished in less than a second\n"); else - msg("finished in %d seconds, throughput %d KBytes/sec\n", - tend_writing - tstart_writing, + msg("finished in %ld seconds, throughput %ld KBytes/sec\n", + (long)(tend_writing - tstart_writing), spcl.c_tapea / (tend_writing - tstart_writing)); putdumptime(); diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 907221d1a9..31fba3e349 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -32,7 +32,7 @@ * * @(#)tape.c 8.4 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/tape.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/dump/tape.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -212,7 +212,7 @@ tperror(int signo) quit("Cannot recover\n"); /* NOTREACHED */ } - msg("write error %d blocks into volume %d\n", blocksthisvol, tapeno); + msg("write error %ld blocks into volume %d\n", blocksthisvol, tapeno); broadcast("DUMP WRITE ERROR!\n"); if (!query("Do you want to restart?")) dumpabort(0); @@ -746,7 +746,7 @@ static void doslave(register int cmd, int slave_number) { register int nread; - int nextslave, size, wrote, eot_count; + int nextslave, size, wrote = 0, eot_count; /* * Need our own seek pointer. diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index ee709ab04e..725d1ee69d 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -32,7 +32,7 @@ * * @(#)traverse.c 8.7 (Berkeley) 6/15/95 * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $ - * $DragonFly: src/sbin/dump/traverse.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $ + * $DragonFly: src/sbin/dump/traverse.c,v 1.7 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -609,11 +609,11 @@ loop: ((off_t)blkno << dev_bshift))) == dev_bsize) continue; if (cnt == -1) { - msg("read error from %s: %s: [sector %d]: count=%d\n", + msg("read error from %s: %s: [sector %d]: count=%ld\n", disk, strerror(errno), blkno, dev_bsize); continue; } - msg("short read error from %s: [sector %d]: count=%d, got=%d\n", + msg("short read error from %s: [sector %d]: count=%ld, got=%d\n", disk, blkno, dev_bsize, cnt); } } diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c index 416f4c27ea..0fa1dbdaec 100644 --- a/sbin/fsck/dir.c +++ b/sbin/fsck/dir.c @@ -32,7 +32,7 @@ * * @(#)dir.c 8.8 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/dir.c,v 1.15 1999/08/28 00:12:45 peter Exp $ - * $DragonFly: src/sbin/fsck/dir.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/fsck/dir.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -102,7 +102,7 @@ dirscan(register struct inodesc *idesc) { register struct direct *dp; register struct bufarea *bp; - int dsize, n; + unsigned int dsize, n; long blksiz; char dbuf[DIRBLKSIZ]; diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c index d339394e6e..79504356e6 100644 --- a/sbin/fsck/inode.c +++ b/sbin/fsck/inode.c @@ -32,7 +32,7 @@ * * @(#)inode.c 8.8 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/inode.c,v 1.20 2000/02/28 20:02:41 mckusick Exp $ - * $DragonFly: src/sbin/fsck/inode.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/fsck/inode.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -235,8 +235,8 @@ chkrange(ufs_daddr_t blk, int cnt) if (cnt > sblock.fs_frag || fragnum(&sblock, blk) + cnt > sblock.fs_frag) { if (debug) - printf("bad size: blk %ld, offset %ld, size %ld\n", - blk, fragnum(&sblock, blk), cnt); + printf("bad size: blk %ld, offset %d, size %d\n", + (long)blk, fragnum(&sblock, blk), cnt); return (1); } c = dtog(&sblock, blk); diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c index 0b8ace6b17..9b2f4b8988 100644 --- a/sbin/fsck/main.c +++ b/sbin/fsck/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1986, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/14/95 * $FreeBSD: src/sbin/fsck/main.c,v 1.21.2.1 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/main.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $ + * $DragonFly: src/sbin/fsck/main.c,v 1.7 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -50,6 +50,7 @@ #include #include #include +#include #include "fsck.h" diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c index 197254ca07..bedc980b7f 100644 --- a/sbin/fsck/pass2.c +++ b/sbin/fsck/pass2.c @@ -32,7 +32,7 @@ * * @(#)pass2.c 8.9 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/pass2.c,v 1.10.2.2 2001/11/24 15:14:59 iedowse Exp $ - * $DragonFly: src/sbin/fsck/pass2.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/fsck/pass2.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -131,9 +131,9 @@ pass2(void) inpend = &inpsort[inplast]; for (inpp = inpsort; inpp < inpend; inpp++) { if (got_siginfo) { - printf("%s: phase 2: dir %d of %d (%d%%)\n", cdevname, - inpp - inpsort, inplast, (inpp - inpsort) * 100 / - inplast); + printf("%s: phase 2: dir %d of %ld (%d%%)\n", cdevname, + inpp - inpsort, inplast, (int)((inpp - inpsort) * 100 / + inplast)); got_siginfo = 0; } inp = *inpp; diff --git a/sbin/fsck/pass3.c b/sbin/fsck/pass3.c index d475029c5e..28633e53cb 100644 --- a/sbin/fsck/pass3.c +++ b/sbin/fsck/pass3.c @@ -32,7 +32,7 @@ * * @(#)pass3.c 8.2 (Berkeley) 4/27/95 * $FreeBSD: src/sbin/fsck/pass3.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/pass3.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/pass3.c,v 1.5 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -56,9 +56,9 @@ pass3(void) for (inpindex = inplast - 1; inpindex >= 0; inpindex--) { if (got_siginfo) { - printf("%s: phase 3: dir %d of %d (%d%%)\n", cdevname, + printf("%s: phase 3: dir %ld of %ld (%d%%)\n", cdevname, inplast - inpindex - 1, inplast, - (inplast - inpindex - 1) * 100 / inplast); + (int)((inplast - inpindex - 1) * 100 / inplast)); got_siginfo = 0; } inp = inpsort[inpindex]; diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index 9c245c5dc6..4231d57399 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -32,7 +32,7 @@ * * @(#)preen.c 8.5 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $ - * $DragonFly: src/sbin/fsck/preen.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $ + * $DragonFly: src/sbin/fsck/preen.c,v 1.7 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -279,8 +279,8 @@ startdisk(register struct disk *dk, int (*checkit)(char *, char *, long ,int)) char * blockcheck(char *origname) { - struct stat stslash, stblock, stchar; - char *newname, *raw; + struct stat stblock; + char *newname; struct fstab *fsinfo; int retried = 0, len; diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c index ed02a5b29a..03d5fdd292 100644 --- a/sbin/fsck/utilities.c +++ b/sbin/fsck/utilities.c @@ -32,7 +32,7 @@ * * @(#)utilities.c 8.6 (Berkeley) 5/19/95 * $FreeBSD: src/sbin/fsck/utilities.c,v 1.11.2.3 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/utilities.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ + * $DragonFly: src/sbin/fsck/utilities.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -479,6 +479,7 @@ getpathname(char *namebuf, ino_t curdir, ino_t ino) memmove(namebuf, cp, (size_t)(&namebuf[MAXPATHLEN] - cp)); } +/* ARGSUSED */ void catch(int sig) { @@ -492,6 +493,7 @@ catch(int sig) * a special exit after filesystem checks complete * so that reboot sequence may be interrupted. */ +/* ARGSUSED */ void catchquit(int sig) { @@ -504,6 +506,7 @@ catchquit(int sig) * Ignore a single quit signal; wait and flush just in case. * Used by child processes in preen. */ +/* ARGSUSED */ void voidquit(int sig) { @@ -513,6 +516,7 @@ voidquit(int sig) (void)signal(SIGQUIT, SIG_DFL); } +/* ARGSUSED */ void infohandler(int sig) { diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index b4bc3ebbcb..6259152a54 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.9.2.2 2002/03/20 13:39:02 joerg Exp $ - * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.5 2003/11/01 17:15:59 drhodus Exp $ + * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -233,7 +233,7 @@ static void printblocks(ino_t inum, struct dinode *dp) { char *bufp; - int i, j, nfrags; + int i, nfrags; long ndb, offset; printf("Blocks for inode %d:\n", inum); diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c index 535033b86e..9510967cfe 100644 --- a/sbin/i386/nextboot/nextboot.c +++ b/sbin/i386/nextboot/nextboot.c @@ -13,7 +13,7 @@ * any damages whatsoever resulting from the use of this software. * * $FreeBSD: src/sbin/i386/nextboot/nextboot.c,v 1.6 1999/08/28 00:13:06 peter Exp $ - * $DragonFly: src/sbin/i386/nextboot/nextboot.c,v 1.3 2003/11/10 06:14:44 dillon Exp $ + * $DragonFly: src/sbin/i386/nextboot/nextboot.c,v 1.4 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index abd7f93b74..431ea7d4e0 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)ifconfig.c 8.2 (Berkeley) 2/16/94 * $FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.51.2.19 2003/01/28 11:02:56 fjoe Exp $ - * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $ + * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -410,7 +410,7 @@ usage(void) } int -main(int argc, const char **argv) +main(int argc, char * const *argv) { int c; int all, namesonly, downonly, uponly; diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c index 48bf891062..7cef50b04d 100644 --- a/sbin/ip6fw/ip6fw.c +++ b/sbin/ip6fw/ip6fw.c @@ -49,7 +49,7 @@ * * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $ * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.1.2.9 2003/04/05 10:54:51 ume Exp $ - * $DragonFly: src/sbin/ip6fw/ip6fw.c,v 1.6 2004/01/06 03:17:21 dillon Exp $ + * $DragonFly: src/sbin/ip6fw/ip6fw.c,v 1.7 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -533,7 +533,7 @@ show_usage(const char *fmt, ...) } static int -lookup_host (char *host, u_char *addr, int family) +lookup_host (const char *host, u_char *addr, int family) { struct hostent *he; @@ -562,7 +562,7 @@ fill_ip6(struct in6_addr *ipno, struct in6_addr *mask, int *acp, char ***avp) *p++ = '\0'; } - if (lookup_host(*av, ipno, AF_INET6) != 0) + if (lookup_host(*av, (u_char *)ipno, AF_INET6) != 0) show_usage("hostname ``%s'' unknown", *av); switch (md) { case '/': @@ -745,7 +745,7 @@ fill_ip6opt(u_char *set, u_char *reset, char **vp) } void -fill_icmptypes(u_long *types, char **vp, u_short *fw_flg) +fill_icmptypes(unsigned *types, char **vp, u_short *fw_flg) { char *c = *vp; diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c index 9746d99f72..947da247df 100644 --- a/sbin/ipfw/ipfw.c +++ b/sbin/ipfw/ipfw.c @@ -17,7 +17,7 @@ * NEW command line interface for IP firewall facility * * $FreeBSD: src/sbin/ipfw/ipfw.c,v 1.80.2.26 2003/01/14 19:15:58 dillon Exp $ - * $DragonFly: src/sbin/ipfw/Attic/ipfw.c,v 1.5 2004/01/22 06:20:08 dillon Exp $ + * $DragonFly: src/sbin/ipfw/Attic/ipfw.c,v 1.6 2004/02/04 17:39:59 joerg Exp $ */ #include @@ -193,7 +193,9 @@ show_ipfw(struct ip_fw *chain, int pcwidth, int bcwidth) char timestr[30]; if (twidth == 0) { - strcpy(timestr, ctime((time_t *)&twidth)); + time_t zerotime = 0; + + strcpy(timestr, ctime(&zerotime)); *strchr(timestr, '\n') = '\0'; twidth = strlen(timestr); } @@ -1169,7 +1171,7 @@ fill_tcpopts(u_char *set, u_char *reset, char **vp) while (p && *p) { struct tpcopts { - char * name; + const char * name; u_char value; } opts[] = { { "mss", IP_FW_TCPOPT_MSS }, diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c index b7930b9c66..7521725631 100644 --- a/sbin/kget/kget.c +++ b/sbin/kget/kget.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/kget/kget.c,v 1.4.2.2 2001/08/01 08:19:51 obrien Exp $ - * $DragonFly: src/sbin/kget/kget.c,v 1.3 2003/11/01 17:15:59 drhodus Exp $ + * $DragonFly: src/sbin/kget/kget.c,v 1.4 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -101,7 +101,7 @@ main(int argc, char *argv[]) id->id_drq); } if(id->id_maddr>0) { - fprintf(fout,"iomem %s%d %#x\n",name,id->id_unit, + fprintf(fout,"iomem %s%d %p\n",name,id->id_unit, id->id_maddr); } if(id->id_msize>0) { diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index 8aba2f1846..f31dc52d4f 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/kldunload/kldunload.c,v 1.10 1999/09/08 05:46:47 bde Exp $ - * $DragonFly: src/sbin/kldunload/kldunload.c,v 1.2 2003/06/17 04:27:33 dillon Exp $ + * $DragonFly: src/sbin/kldunload/kldunload.c,v 1.3 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -74,7 +74,7 @@ main(int argc, char** argv) argc--; } - if (argc != 0 || fileid && filename) + if (argc != 0 || (fileid && filename)) usage(); if (fileid == 0 && filename == 0) diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 0676dec647..4d29922289 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_nfs.c 8.11 (Berkeley) 5/4/95 * $FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.36.2.6 2003/05/13 14:45:40 trhodes Exp $ - * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.7 2003/12/29 00:07:44 dillon Exp $ + * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.8 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -573,7 +573,6 @@ getnfsargs(char *spec, struct nfs_args *nfsargsp) struct sockaddr_in saddr; enum tryret ret; int speclen, remoteerr; - int save_retry, save_retrans; char *hostp, *delimp, *errstr; #ifdef NFSKERB char *cp; diff --git a/sbin/mount_portal/pt_tcplisten.c b/sbin/mount_portal/pt_tcplisten.c index 86a1fc9f92..6495b356cb 100644 --- a/sbin/mount_portal/pt_tcplisten.c +++ b/sbin/mount_portal/pt_tcplisten.c @@ -38,7 +38,7 @@ * * @(#)pt_tcp.c 8.3 (Berkeley) 3/27/94 * - * $DragonFly: src/sbin/mount_portal/pt_tcplisten.c,v 1.2 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_portal/pt_tcplisten.c,v 1.3 2004/02/04 17:40:00 joerg Exp $ * pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp */ @@ -78,7 +78,7 @@ int portal_tcplisten(struct portal_cred *pcr, char *key, char **v, int kso, char *q; struct hostent *hp; struct servent *sp; - struct in_addr **ipp; + struct in_addr **ipp = NULL; struct in_addr *ip[2]; struct in_addr ina; u_short s_port; diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c index 3accededc1..75f14b9969 100644 --- a/sbin/mount_umap/mount_umap.c +++ b/sbin/mount_umap/mount_umap.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_umap.c 8.5 (Berkeley) 4/26/95 * $FreeBSD: src/sbin/mount_umap/mount_umap.c,v 1.15 1999/10/09 11:54:13 phk Exp $ - * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ + * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.6 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -47,6 +47,7 @@ #include #include +#include #include #include #include diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 4ff98200e7..1004d09964 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)mountd.c 8.15 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/mountd/mountd.c,v 1.39.2.5 2002/09/13 15:57:43 joerg Exp $ - * $DragonFly: src/sbin/mountd/mountd.c,v 1.6 2003/11/03 19:51:05 eirikn Exp $ + * $DragonFly: src/sbin/mountd/mountd.c,v 1.7 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -197,7 +197,7 @@ struct ucred def_anon = { int force_v2 = 0; int resvport_only = 1; int dir_only = 1; -int log = 0; +int do_log = 0; int opt_flags; /* Bits for above */ #define OP_MAPROOT 0x01 @@ -256,7 +256,7 @@ main(int argc, char **argv) debug = debug ? 0 : 1; break; case 'l': - log = 1; + do_log = 1; break; default: usage(); @@ -441,7 +441,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) dirpath); if (debug) warnx("mount successful"); - if (log) + if (do_log) syslog(LOG_NOTICE, "mount request succeeded from %s for %s", inet_ntoa(saddrin), dirpath); @@ -459,7 +459,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) case RPCMNT_DUMP: if (!svc_sendreply(transp, xdr_mlist, (caddr_t)NULL)) syslog(LOG_ERR, "can't send reply"); - else if (log) + else if (do_log) syslog(LOG_NOTICE, "dump request succeeded from %s", inet_ntoa(saddrin)); @@ -489,7 +489,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) if (hp) del_mlist(hp->h_name, dirpath); del_mlist(inet_ntoa(saddrin), dirpath); - if (log) + if (do_log) syslog(LOG_NOTICE, "umount request succeeded from %s for %s", inet_ntoa(saddrin), dirpath); @@ -508,7 +508,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) if (hp) del_mlist(hp->h_name, (char *)NULL); del_mlist(inet_ntoa(saddrin), (char *)NULL); - if (log) + if (do_log) syslog(LOG_NOTICE, "umountall request succeeded from %s", inet_ntoa(saddrin)); @@ -516,7 +516,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) case RPCMNT_EXPORT: if (!svc_sendreply(transp, xdr_explist, (caddr_t)NULL)) syslog(LOG_ERR, "can't send reply"); - if (log) + if (do_log) syslog(LOG_NOTICE, "export request succeeded from %s", inet_ntoa(saddrin)); diff --git a/sbin/newfs/fscopy.c b/sbin/newfs/fscopy.c index d1d9c1d579..801c651bfc 100644 --- a/sbin/newfs/fscopy.c +++ b/sbin/newfs/fscopy.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sbin/newfs/fscopy.c,v 1.1 2003/12/01 04:35:39 dillon Exp $ + * $DragonFly: src/sbin/newfs/fscopy.c,v 1.2 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -191,7 +191,7 @@ FSCopy(fsnode_t *phlinks, const char *path) free(node); node = NULL; } else if ((n = open(path, O_RDONLY)) < 0) { - fprintf(stderr, "Unable to open %s for reading %s\n", path); + fprintf(stderr, "Unable to open %s for reading\n", path); free(node->fs_Data); free(node); node = NULL; diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 8f5f40a7a8..aa4205b4a9 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -32,7 +32,7 @@ * * @(#)mkfs.c 8.11 (Berkeley) 5/3/95 * $FreeBSD: src/sbin/newfs/mkfs.c,v 1.29.2.6 2001/09/21 19:15:21 dillon Exp $ - * $DragonFly: src/sbin/newfs/mkfs.c,v 1.6 2003/12/01 04:35:39 dillon Exp $ + * $DragonFly: src/sbin/newfs/mkfs.c,v 1.7 2004/02/04 17:40:00 joerg Exp $ */ #include "defs.h" @@ -105,6 +105,8 @@ extern u_long memleft; /* virtual memory available */ extern caddr_t membase; /* start address of memory based filesystem */ extern char * filename; +extern void fatal(const char *fmt, ...); + union { struct fs fs; char pad[SBSIZE]; diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index e5c53a3ee6..617c99c8eb 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)newfs.c 8.13 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/newfs/newfs.c,v 1.30.2.9 2003/05/13 12:03:55 joerg Exp $ - * $DragonFly: src/sbin/newfs/newfs.c,v 1.6 2003/12/01 04:35:39 dillon Exp $ + * $DragonFly: src/sbin/newfs/newfs.c,v 1.7 2004/02/04 17:40:00 joerg Exp $ */ /* @@ -202,6 +202,8 @@ int unlabeled; char device[MAXPATHLEN]; char *progname; +struct disklabel *getdisklabel(char *, int); +static void rewritelabel(char *, int, struct disklabel *); static void usage(void); int @@ -215,8 +217,8 @@ main(int argc, char **argv) struct partition oldpartition; struct stat st; struct statfs *mp; - int fsi, fso, len, n, vflag; - char *cp, *s1, *s2, *special, *opstring; + int fsi = 0, fso, len, n, vflag; + char *cp = NULL, *s1, *s2, *special, *opstring; #ifdef MFS struct vfsconf vfc; int error; @@ -679,7 +681,8 @@ getdisklabel(char *s, int fd) return (&lab); } -rewritelabel(char *s, int fd, register struct disklabel *lp) +static void +rewritelabel(char *s, int fd, struct disklabel *lp) { #ifdef COMPAT if (unlabeled) diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index cc915cbe77..ddf57606ed 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)nfsd.c 8.9 (Berkeley) 3/29/95 * $FreeBSD: src/sbin/nfsd/nfsd.c,v 1.15.2.1 2000/09/16 22:52:23 brian Exp $ - * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ + * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.6 2004/02/04 17:40:00 joerg Exp $ */ #include @@ -128,8 +128,8 @@ main(int argc, char **argv, char **envp) char *cp; #endif fd_set ready, sockbits; - int ch, cltpflag, connect_type_cnt, i, len, maxsock, msgsock; - int nfsdcnt, nfssvc_flag, on, reregister, sock, tcpflag, tcpsock; + int ch, cltpflag, connect_type_cnt, i, len, maxsock = -1, msgsock; + int nfsdcnt, nfssvc_flag, on, reregister, sock, tcpflag, tcpsock = -1; int tp4cnt, tp4flag, tpipcnt, tpipflag, udpflag; int bindhostc = 0, bindanyflag; char **bindhost = NULL; diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 4b33d1aae6..f2a5551430 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -31,7 +31,7 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)ping.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/ping6/ping6.c,v 1.4.2.10 2002/12/09 03:04:44 suz Exp $ - * $DragonFly: src/sbin/ping6/ping6.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $ + * $DragonFly: src/sbin/ping6/ping6.c,v 1.6 2004/02/04 17:40:01 joerg Exp $ */ /* BSDI ping.c,v 2.3 1996/01/21 17:56:50 jch Exp */ @@ -1918,7 +1918,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen) if (nilen % (sizeof(u_int32_t) + sizeof(struct in6_addr)) == 0) withttl = 1; while (nilen > 0) { - u_int32_t ttl; + u_int32_t ttl = 0; if (withttl) { /* XXX: alignment? */ diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c index f289195ad2..8512519ace 100644 --- a/sbin/rcorder/rcorder.c +++ b/sbin/rcorder/rcorder.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: rcorder.c,v 1.7 2000/08/04 07:33:55 enami Exp $ - * $DragonFly: src/sbin/rcorder/rcorder.c,v 1.5 2003/12/11 22:08:31 dillon Exp $ + * $DragonFly: src/sbin/rcorder/rcorder.c,v 1.6 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -804,7 +804,6 @@ generate_ordering(void) */ filenode *file; f_provnode *f_prov; - provnode *prov; for (file = fn_head->next; file; file = file->next) { for (f_prov = file->prov_list; f_prov; f_prov = f_prov->next) { @@ -820,7 +819,6 @@ generate_ordering(void) strnodelist *scan; filenode *file; f_provnode *f_prov; - provnode *prov; for (scan = onetime_list; scan; scan = scan->next) { for (file = fn_head->next; file; file = file->next) { diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index 58097cac42..438e52b65c 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -37,7 +37,7 @@ * * @(#)dirs.c 8.7 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/dirs.c,v 1.14.2.5 2001/10/15 13:44:45 dd Exp $ - * $DragonFly: src/sbin/restore/dirs.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ + * $DragonFly: src/sbin/restore/dirs.c,v 1.6 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -146,7 +146,7 @@ extractdirs(int genmode) vprintf(stdout, "Extract directories from tape\n"); if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') tmpdir = _PATH_TMP; - (void) sprintf(dirfile, "%s/rstdir%d", tmpdir, dumpdate); + sprintf(dirfile, "%s/rstdir%ld", tmpdir, (long)dumpdate); if (command != 'r' && command != 'R') { (void *) strcat(dirfile, "-XXXXXX"); fd = mkstemp(dirfile); @@ -159,7 +159,7 @@ extractdirs(int genmode) done(1); } if (genmode != 0) { - (void) sprintf(modefile, "%s/rstmode%d", tmpdir, dumpdate); + sprintf(modefile, "%s/rstmode%ld", tmpdir, (long)dumpdate); if (command != 'r' && command != 'R') { (void *) strcat(modefile, "-XXXXXX"); fd = mkstemp(modefile); @@ -578,7 +578,7 @@ setdirmodes(int flags) if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') tmpdir = _PATH_TMP; if (command == 'r' || command == 'R') - (void) sprintf(modefile, "%s/rstmode%d", tmpdir, dumpdate); + sprintf(modefile, "%s/rstmode%ld", tmpdir, (long)dumpdate); if (modefile[0] == '#') { panic("modefile not defined\n"); fprintf(stderr, "directory mode, owner, and times not set\n"); diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c index 70c7f406d9..14d3d46cf4 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -32,7 +32,7 @@ * * @(#)interactive.c 8.5 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/interactive.c,v 1.8.2.1 2001/01/03 14:36:08 iedowse Exp $ - * $DragonFly: src/sbin/restore/interactive.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ + * $DragonFly: src/sbin/restore/interactive.c,v 1.6 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -488,7 +488,7 @@ canon(char *rawname, char *canonname, int len) static void printlist(char *name, char *basename) { - register struct afile *fp, *list, *listp; + register struct afile *fp, *list, *listp = NULL; register struct direct *dp; struct afile single; RST_DIR *dirp; @@ -632,7 +632,7 @@ formatf(register struct afile *list, int nentry) { register struct afile *fp, *endlist; int width, bigino, haveprefix, havepostfix; - int i, j, w, precision, columns, lines; + int i, j, w, precision = 0, columns, lines; width = 0; haveprefix = 0; diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 227675a6ba..78137f7bc6 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -37,7 +37,7 @@ * * @(#)tape.c 8.9 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/tape.c,v 1.16.2.8 2002/06/30 22:57:52 iedowse Exp $ - * $DragonFly: src/sbin/restore/tape.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ + * $DragonFly: src/sbin/restore/tape.c,v 1.6 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -158,7 +158,7 @@ setinput(char *source) void newtapebuf(long size) { - static tapebufsize = -1; + static long tapebufsize = -1; ntrec = size; if (size <= tapebufsize) @@ -292,7 +292,7 @@ setup(void) void getvol(long nextvol) { - long newvol, prevtapea, savecnt, i; + long newvol = 0, prevtapea, savecnt, i; union u_spcl tmpspcl; # define tmpbuf tmpspcl.s_spcl char buf[TP_BSIZE]; @@ -395,7 +395,7 @@ gethdr: goto again; } if (tmpbuf.c_volume != volno) { - fprintf(stderr, "Wrong volume (%ld)\n", tmpbuf.c_volume); + fprintf(stderr, "Wrong volume (%ld)\n", (long)tmpbuf.c_volume); volno = 0; goto again; } @@ -416,7 +416,7 @@ gethdr: * of the next record. */ dprintf(stdout, "last rec %ld, tape starts with %ld\n", prevtapea, - tmpbuf.c_tapea); + (long)tmpbuf.c_tapea); if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) { if (curfile.action != USING) { /* @@ -513,7 +513,7 @@ printdumpinfo(void) if (spcl.c_host[0] == '\0') return; fprintf(stderr, "Level %ld dump of %s on %s:%s\n", - spcl.c_level, spcl.c_filesys, spcl.c_host, spcl.c_dev); + (long)spcl.c_level, spcl.c_filesys, spcl.c_host, spcl.c_dev); fprintf(stderr, "Label: %s\n", spcl.c_label); } @@ -1157,7 +1157,7 @@ accthdr(struct s_spcl *header) oldinofmt ? "old" : "new"); if (header->c_firstrec) fprintf(stderr, "begins with record %ld", - header->c_firstrec); + (long)header->c_firstrec); fprintf(stderr, "\n"); previno = 0x7fffffff; return; diff --git a/sbin/route/route.c b/sbin/route/route.c index 94e9a72d6a..6274164565 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1989, 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)route.c 8.6 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/route/route.c,v 1.40.2.11 2003/02/27 23:10:10 ru Exp $ - * $DragonFly: src/sbin/route/route.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ + * $DragonFly: src/sbin/route/route.c,v 1.5 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -954,6 +954,7 @@ getaddr(int which, char *s, struct hostent **hpp) case RTA_NETMASK: case RTA_GENMASK: /* bzero(su, sizeof(*su)); *//* for readability */ + break; } return (0); } @@ -1438,7 +1439,7 @@ print_getmsg(register struct rt_msghdr *rtm, int msglen) register char *cp; register int i; - (void) printf(" route to: %s\n", routename(&so_dst)); + (void) printf(" route to: %s\n", routename(&so_dst.sa)); if (rtm->rtm_version != RTM_VERSION) { warnx("routing message version %d not understood", rtm->rtm_version); diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c index 48efefa1b6..f823c6109c 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -33,7 +33,7 @@ * @(#)radix.c 8.4 (Berkeley) 11/2/94 * * $FreeBSD: src/sbin/routed/radix.c,v 1.5 1999/09/05 17:49:11 peter Exp $ - * $DragonFly: src/sbin/routed/radix.c,v 1.2 2003/06/17 04:27:34 dillon Exp $ + * $DragonFly: src/sbin/routed/radix.c,v 1.3 2004/02/04 17:40:01 joerg Exp $ */ /* @@ -849,7 +849,7 @@ rn_walktree(struct radix_node_head *h, } int -rn_inithead(void **head, int off) +rn_inithead(struct radix_node_head **head, int off) { struct radix_node_head *rnh; struct radix_node *t, *tt, *ttt; @@ -890,7 +890,7 @@ rn_init(void) addmask_key = cplim = rn_ones + max_keylen; while (cp < cplim) *cp++ = -1; - if (rn_inithead((void **)&mask_rnhead, 0) == 0) + if (rn_inithead(&mask_rnhead, 0) == 0) panic("rn_init 2"); } diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h index 0bc584cc51..793e8ce181 100644 --- a/sbin/routed/radix.h +++ b/sbin/routed/radix.h @@ -33,7 +33,7 @@ * @(#)radix.h 8.2 (Berkeley) 10/31/94 * * $FreeBSD: src/sbin/routed/radix.h,v 1.4 1999/08/28 00:14:17 peter Exp $ - * $DragonFly: src/sbin/routed/radix.h,v 1.4 2003/11/03 19:51:05 eirikn Exp $ + * $DragonFly: src/sbin/routed/radix.h,v 1.5 2004/02/04 17:40:01 joerg Exp $ */ #ifndef __RADIX_H_ @@ -143,7 +143,7 @@ struct radix_node_head { #define Free(p) free((void *)p); void rn_init(void); -int rn_inithead(void **, int); +int rn_inithead(struct radix_node_head **, int); int rn_refines(void *, void *); int rn_walktree(struct radix_node_head *, int (*)(struct radix_node *, struct walkarg *), diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 960aabc8ca..3c8d5ed72d 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/routed/table.c,v 1.9.2.2 2000/08/14 17:00:04 sheldonh Exp $ - * $DragonFly: src/sbin/routed/table.c,v 1.2 2003/06/17 04:27:34 dillon Exp $ + * $DragonFly: src/sbin/routed/table.c,v 1.3 2004/02/04 17:40:01 joerg Exp $ */ #include "defs.h" @@ -1618,7 +1618,7 @@ rtinit(void) /* Initialize the radix trees */ max_keylen = sizeof(struct sockaddr_in); rn_init(); - rn_inithead((void**)&rhead, 32); + rn_inithead(&rhead, 32); /* mark all of the slots in the table free */ ag_avail = ag_slots; diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 5febd33dca..8ecc82728c 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1986, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)savecore.c 8.3 (Berkeley) 1/2/94 * $FreeBSD: src/sbin/savecore/savecore.c,v 1.28.2.13 2002/04/07 21:17:50 asmodai Exp $ - * $DragonFly: src/sbin/savecore/savecore.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ + * $DragonFly: src/sbin/savecore/savecore.c,v 1.5 2004/02/04 17:40:01 joerg Exp $ */ #include @@ -339,7 +339,7 @@ dump_exists(void) (off_t)(dumplo + ok(dump_nl[X_DUMPMAG].n_value)), L_SET); if (newdumpmag != dumpmag) { if (verbose) - syslog(LOG_WARNING, "magic number mismatch (%x != %x)", + syslog(LOG_WARNING, "magic number mismatch (%lx != %lx)", newdumpmag, dumpmag); syslog(LOG_WARNING, "no core dump"); return (0); @@ -359,7 +359,7 @@ save_core(void) { register FILE *fp; register int bounds, ifd, nr, nw; - int hs, he; /* start and end of hole */ + int hs, he = 0; /* start and end of hole */ char path[MAXPATHLEN]; mode_t oumask; @@ -406,7 +406,7 @@ err1: syslog(LOG_WARNING, "%s: %m", path); syslog(LOG_NOTICE, "writing %score to %s", compress ? "compressed " : "", path); for (; dumpsize > 0; dumpsize -= nr) { - (void)printf("%6dK\r", dumpsize / 1024); + printf("%6ldK\r", (long)(dumpsize / 1024)); (void)fflush(stdout); nr = read(dumpfd, buf, MIN(dumpsize, sizeof(buf))); if (nr <= 0) { diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 095829857d..d798e090bd 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1993 The Regents of the University of California. All rights reserved. * @(#)from: sysctl.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/sbin/sysctl/sysctl.c,v 1.25.2.11 2003/05/01 22:48:08 trhodes Exp $ - * $DragonFly: src/sbin/sysctl/sysctl.c,v 1.3 2003/06/29 06:48:32 dillon Exp $ + * $DragonFly: src/sbin/sysctl/sysctl.c,v 1.4 2004/02/04 17:40:01 joerg Exp $ */ #ifdef __i386__ @@ -407,12 +407,12 @@ struct _foo { int majdev; char *name; } maj2name[] = { - 30, "ad", - 0, "wd", - 1, "wfd", - 2, "fd", - 4, "da", - -1, NULL /* terminator */ + { 30, "ad" }, + { 0, "wd" }, + { 1, "wfd" }, + { 2, "fd" }, + { 4, "da" }, + { -1, NULL } /* terminator */ }; static int @@ -421,8 +421,8 @@ machdep_bootdev(u_long value) int majdev, unit, slice, part; struct _foo *p; - if (value & B_MAGICMASK != B_DEVMAGIC) { - printf("invalid (0x%08x)", value); + if ((value & B_MAGICMASK) != B_DEVMAGIC) { + printf("invalid (0x%08lx)", value); return 0; } majdev = B_TYPE(value); diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c index de4dec0e62..a5d5117311 100644 --- a/sbin/vinum/commands.c +++ b/sbin/vinum/commands.c @@ -38,7 +38,7 @@ * * $Id: commands.c,v 1.14 2000/11/14 20:01:23 grog Exp grog $ * $FreeBSD: src/sbin/vinum/commands.c,v 1.31.2.6 2003/06/06 05:13:29 grog Exp $ - * $DragonFly: src/sbin/vinum/commands.c,v 1.4 2003/11/21 22:46:13 dillon Exp $ + * $DragonFly: src/sbin/vinum/commands.c,v 1.5 2004/02/04 17:40:01 joerg Exp $ */ #define _KERNEL_STRUCTURES @@ -658,6 +658,7 @@ vinum_start(int argc, char *argv[], char *arg0[]) break; default: + break; } if (doit) { @@ -1044,6 +1045,7 @@ vinum_attach(int argc, char *argv[], char *argv0[]) break; default: /* can't get here */ + break; } } checkupdates(); /* make sure we're updating */ @@ -1654,11 +1656,13 @@ vinum_stripe(int argc, char *argv[], char *argv0[]) enum objecttype type; off_t maxsize; int fe; /* freelist entry index */ - struct drive_freelist freelist; - struct ferq { /* request to pass to ioctl */ - int driveno; - int fe; - } *ferq = (struct ferq *) &freelist; + union freeunion { + struct drive_freelist freelist; + struct ferq { /* request to pass to ioctl */ + int driveno; + int fe; + } ferq; + } freeunion; u_int64_t bigchunk; /* biggest chunk in freelist */ maxsize = QUAD_MAX; @@ -1683,16 +1687,16 @@ vinum_stripe(int argc, char *argv[], char *argv0[]) /* Now find the largest chunk available on the drive */ bigchunk = 0; /* ain't found nothin' yet */ for (fe = 0; fe < drive->freelist_entries; fe++) { - ferq->driveno = drive->driveno; - ferq->fe = fe; - if (ioctl(superdev, VINUM_GETFREELIST, &freelist) < 0) { + freeunion.ferq.driveno = drive->driveno; + freeunion.ferq.fe = fe; + if (ioctl(superdev, VINUM_GETFREELIST, &freeunion.freelist) < 0) { fprintf(stderr, "Can't get free list element %d: %s\n", fe, strerror(errno)); longjmp(command_fail, -1); } - bigchunk = bigchunk > freelist.sectors ? bigchunk : freelist.sectors; /* max it */ + bigchunk = bigchunk > freeunion.freelist.sectors ? bigchunk : freeunion.freelist.sectors; /* max it */ } maxsize = min(maxsize, bigchunk); /* this is as much as we can do */ } @@ -1798,11 +1802,13 @@ vinum_raid4(int argc, char *argv[], char *argv0[]) enum objecttype type; off_t maxsize; int fe; /* freelist entry index */ - struct drive_freelist freelist; - struct ferq { /* request to pass to ioctl */ - int driveno; - int fe; - } *ferq = (struct ferq *) &freelist; + union freeunion { + struct drive_freelist freelist; + struct ferq { /* request to pass to ioctl */ + int driveno; + int fe; + } ferq; + } freeunion; u_int64_t bigchunk; /* biggest chunk in freelist */ maxsize = QUAD_MAX; @@ -1827,16 +1833,16 @@ vinum_raid4(int argc, char *argv[], char *argv0[]) /* Now find the largest chunk available on the drive */ bigchunk = 0; /* ain't found nothin' yet */ for (fe = 0; fe < drive->freelist_entries; fe++) { - ferq->driveno = drive->driveno; - ferq->fe = fe; - if (ioctl(superdev, VINUM_GETFREELIST, &freelist) < 0) { + freeunion.ferq.driveno = drive->driveno; + freeunion.ferq.fe = fe; + if (ioctl(superdev, VINUM_GETFREELIST, &freeunion.freelist) < 0) { fprintf(stderr, "Can't get free list element %d: %s\n", fe, strerror(errno)); longjmp(command_fail, -1); } - bigchunk = bigchunk > freelist.sectors ? bigchunk : freelist.sectors; /* max it */ + bigchunk = bigchunk > freeunion.freelist.sectors ? bigchunk : freeunion.freelist.sectors; /* max it */ } maxsize = min(maxsize, bigchunk); /* this is as much as we can do */ } @@ -1942,11 +1948,13 @@ vinum_raid5(int argc, char *argv[], char *argv0[]) enum objecttype type; off_t maxsize; int fe; /* freelist entry index */ - struct drive_freelist freelist; - struct ferq { /* request to pass to ioctl */ - int driveno; - int fe; - } *ferq = (struct ferq *) &freelist; + union freeunion { + struct drive_freelist freelist; + struct ferq { /* request to pass to ioctl */ + int driveno; + int fe; + } ferq; + } freeunion; u_int64_t bigchunk; /* biggest chunk in freelist */ maxsize = QUAD_MAX; @@ -1971,16 +1979,16 @@ vinum_raid5(int argc, char *argv[], char *argv0[]) /* Now find the largest chunk available on the drive */ bigchunk = 0; /* ain't found nothin' yet */ for (fe = 0; fe < drive->freelist_entries; fe++) { - ferq->driveno = drive->driveno; - ferq->fe = fe; - if (ioctl(superdev, VINUM_GETFREELIST, &freelist) < 0) { + freeunion.ferq.driveno = drive->driveno; + freeunion.ferq.fe = fe; + if (ioctl(superdev, VINUM_GETFREELIST, &freeunion.freelist) < 0) { fprintf(stderr, "Can't get free list element %d: %s\n", fe, strerror(errno)); longjmp(command_fail, -1); } - bigchunk = bigchunk > freelist.sectors ? bigchunk : freelist.sectors; /* max it */ + bigchunk = bigchunk > freeunion.freelist.sectors ? bigchunk : freeunion.freelist.sectors; /* max it */ } maxsize = min(maxsize, bigchunk); /* this is as much as we can do */ } @@ -2092,11 +2100,13 @@ vinum_mirror(int argc, char *argv[], char *argv0[]) enum objecttype type; off_t maxsize[2]; /* maximum subdisk size for striped plexes */ int fe; /* freelist entry index */ - struct drive_freelist freelist; - struct ferq { /* request to pass to ioctl */ - int driveno; - int fe; - } *ferq = (struct ferq *) &freelist; + union freeunion { + struct drive_freelist freelist; + struct ferq { /* request to pass to ioctl */ + int driveno; + int fe; + } ferq; + } freeunion; u_int64_t bigchunk; /* biggest chunk in freelist */ if (sflag) /* striped, */ @@ -2130,16 +2140,16 @@ vinum_mirror(int argc, char *argv[], char *argv0[]) /* Find the largest chunk available on the drive */ bigchunk = 0; /* ain't found nothin' yet */ for (fe = 0; fe < drive->freelist_entries; fe++) { - ferq->driveno = drive->driveno; - ferq->fe = fe; - if (ioctl(superdev, VINUM_GETFREELIST, &freelist) < 0) { + freeunion.ferq.driveno = drive->driveno; + freeunion.ferq.fe = fe; + if (ioctl(superdev, VINUM_GETFREELIST, &freeunion.freelist) < 0) { fprintf(stderr, "Can't get free list element %d: %s\n", fe, strerror(errno)); longjmp(command_fail, -1); } - bigchunk = bigchunk > freelist.sectors ? bigchunk : freelist.sectors; /* max it */ + bigchunk = bigchunk > freeunion.freelist.sectors ? bigchunk : freeunion.freelist.sectors; /* max it */ } maxsize[o & 1] = min(maxsize[o & 1], bigchunk); /* get the maximum size of a subdisk */ } diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c index bf98a29762..00a64f0567 100644 --- a/sbin/vinum/list.c +++ b/sbin/vinum/list.c @@ -41,7 +41,7 @@ * * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $ * $FreeBSD: src/sbin/vinum/list.c,v 1.25.2.4 2001/05/28 05:58:04 grog Exp $ - * $DragonFly: src/sbin/vinum/list.c,v 1.4 2003/11/21 22:46:13 dillon Exp $ + * $DragonFly: src/sbin/vinum/list.c,v 1.5 2004/02/04 17:40:01 joerg Exp $ */ #define _KERNEL_STRUCTURES @@ -89,13 +89,13 @@ roughlength(int64_t bytes, int lj) static char description[16]; if (bytes > (int64_t) MEGABYTE * 10000) /* gigabytes */ - sprintf(description, lj ? "%lld GB" : "%10d GB", bytes / GIGABYTE); + sprintf(description, lj ? "%lld GB" : "%10lld GB", bytes / GIGABYTE); else if (bytes > KILOBYTE * 10000) /* megabytes */ - sprintf(description, lj ? "%lld MB" : "%10d MB", bytes / MEGABYTE); + sprintf(description, lj ? "%lld MB" : "%10lld MB", bytes / MEGABYTE); else if (bytes > 10000) /* kilobytes */ - sprintf(description, lj ? "%lld kB" : "%10d kB", bytes / KILOBYTE); + sprintf(description, lj ? "%lld kB" : "%10lld kB", bytes / KILOBYTE); else /* bytes */ - sprintf(description, lj ? "%lld B" : "%10d B", bytes); + sprintf(description, lj ? "%lld B" : "%10lld B", bytes); return description; } @@ -186,18 +186,20 @@ vinum_ldi(int driveno, int recurse) drive.maxactive); if (Verbose) { /* print the free list */ int fe; /* freelist entry */ - struct drive_freelist freelist; - struct ferq { /* request to pass to ioctl */ - int driveno; - int fe; - } *ferq = (struct ferq *) &freelist; + union freeunion { + struct drive_freelist freelist; + struct ferq { /* request to pass to ioctl */ + int driveno; + int fe; + } ferq; + } freeunion; printf("\t\tFree list contains %d entries:\n\t\t Offset\t Size\n", drive.freelist_entries); for (fe = 0; fe < drive.freelist_entries; fe++) { - ferq->driveno = drive.driveno; - ferq->fe = fe; - if (ioctl(superdev, VINUM_GETFREELIST, &freelist) < 0) { + freeunion.ferq.driveno = drive.driveno; + freeunion.ferq.fe = fe; + if (ioctl(superdev, VINUM_GETFREELIST, &freeunion.freelist) < 0) { fprintf(stderr, "Can't get free list element %d: %s\n", fe, @@ -205,8 +207,8 @@ vinum_ldi(int driveno, int recurse) longjmp(command_fail, -1); } printf("\t\t%9lld\t%9lld\n", - (long long) freelist.offset, - (long long) freelist.sectors); + (long long) freeunion.freelist.offset, + (long long) freeunion.freelist.sectors); } } } else if (!sflag) { -- 2.41.0