diff options
| -rw-r--r-- | usr.sbin/makefs/msdos/msdosfs_lookup.c | 4 | ||||
| -rw-r--r-- | usr.sbin/mtrace/mtrace.c | 4 | ||||
| -rw-r--r-- | usr.sbin/pcidump/pcidump.c | 4 | ||||
| -rw-r--r-- | usr.sbin/quot/quot.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/makefs/msdos/msdosfs_lookup.c b/usr.sbin/makefs/msdos/msdosfs_lookup.c index 87c8ca0ba77..33e1bd9bb4e 100644 --- a/usr.sbin/makefs/msdos/msdosfs_lookup.c +++ b/usr.sbin/makefs/msdos/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_lookup.c,v 1.2 2016/10/22 22:20:24 natano Exp $ */ +/* $OpenBSD: msdosfs_lookup.c,v 1.3 2017/08/31 12:03:02 otto Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.35 2016/01/30 09:59:27 mlelstv Exp $ */ /*- @@ -133,7 +133,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct c */ if (ddep->de_fndcnt > 0) { u_int8_t chksum = winChksum(ndep->deName); - const u_char *un = (const u_char *)cnp->cn_nameptr; + u_char *un = cnp->cn_nameptr; int unlen = cnp->cn_namelen; u_long xhavecnt; diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c index 717c251c20c..8b5e657fa0d 100644 --- a/usr.sbin/mtrace/mtrace.c +++ b/usr.sbin/mtrace/mtrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrace.c,v 1.38 2017/01/21 08:33:51 krw Exp $ */ +/* $OpenBSD: mtrace.c,v 1.39 2017/08/31 12:03:02 otto Exp $ */ /* $NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $ */ /* @@ -946,7 +946,7 @@ fixup_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new) /* Check for byte-swappers */ while (--rno >= 0) { --n; --p; --b; --s; - if (*s || abs(ntohl(n->tr_vifout) - ntohl(p->tr_vifout)) > 100000) { + if (*s || ntohl(n->tr_vifout) - ntohl(p->tr_vifout) > 100000) { /* This host sends byteswapped reports; swap 'em */ if (!*s) { *s = 1; diff --git a/usr.sbin/pcidump/pcidump.c b/usr.sbin/pcidump/pcidump.c index 17fe177aa54..a36b94354d6 100644 --- a/usr.sbin/pcidump/pcidump.c +++ b/usr.sbin/pcidump/pcidump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcidump.c,v 1.45 2017/06/16 05:19:15 jsg Exp $ */ +/* $OpenBSD: pcidump.c,v 1.46 2017/08/31 12:03:02 otto Exp $ */ /* * Copyright (c) 2006, 2007 David Gwynne <loki@animata.net> @@ -20,7 +20,7 @@ #include <sys/ioctl.h> #include <sys/pciio.h> -#include <stdio.h> /* need NULL for <dev/pci/*.h> */ +#include <stdio.h> /* need NULL for dev/pci/ headers */ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 896d8601634..74c5b902775 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quot.c,v 1.28 2015/11/12 22:33:07 deraadt Exp $ */ +/* $OpenBSD: quot.c,v 1.29 2017/08/31 12:03:02 otto Exp $ */ /* * Copyright (C) 1991, 1994 Wolfgang Solfrank. @@ -469,7 +469,7 @@ donames(int fd, struct fs *super, char *name) ungetc(c, stdin); inode1 = -1; while (scanf("%llu", &inode) == 1) { - if (inode < 0 || inode > maxino) { + if (inode > maxino) { #ifndef COMPAT fprintf(stderr, "invalid inode %llu\n", (unsigned long long)inode); |