diff options
| -rw-r--r-- | bin/md5/md5.c | 7 | ||||
| -rw-r--r-- | lib/libc/net/if_nameindex.c | 4 | ||||
| -rw-r--r-- | sbin/fsck_ext2fs/inode.c | 4 | ||||
| -rw-r--r-- | sbin/fsck_ffs/inode.c | 4 | ||||
| -rw-r--r-- | sbin/umount/umount.c | 6 | ||||
| -rw-r--r-- | usr.bin/ftp/fetch.c | 7 | ||||
| -rw-r--r-- | usr.bin/ftp/main.c | 7 | ||||
| -rw-r--r-- | usr.bin/ftp/small.c | 6 |
8 files changed, 30 insertions, 15 deletions
diff --git a/bin/md5/md5.c b/bin/md5/md5.c index ee44bd159f1..3e00484d2d4 100644 --- a/bin/md5/md5.c +++ b/bin/md5/md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.c,v 1.87 2016/09/03 17:01:01 tedu Exp $ */ +/* $OpenBSD: md5.c,v 1.88 2016/12/16 17:44:59 krw Exp $ */ /* * Copyright (c) 2001,2003,2005-2007,2010,2013,2014 @@ -209,7 +209,10 @@ main(int argc, char **argv) size_t len; char *cp, *input_string, *selective_checklist; const char *optstr; - int fl, error, base64, i; + int fl, error, base64; +#if !defined(SHA2_ONLY) + int i; +#endif int bflag, cflag, pflag, rflag, tflag, xflag; if (pledge("stdio rpath wpath cpath", NULL) == -1) diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c index 123ac85ad69..6e5bc0809a7 100644 --- a/lib/libc/net/if_nameindex.c +++ b/lib/libc/net/if_nameindex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nameindex.c,v 1.12 2016/12/15 20:50:36 krw Exp $ */ +/* $OpenBSD: if_nameindex.c,v 1.13 2016/12/16 17:44:59 krw Exp $ */ /* $KAME: if_nameindex.c,v 1.7 2000/11/24 08:17:20 itojun Exp $ */ /*- @@ -81,7 +81,7 @@ if_nameindex(void) struct if_nameindex_msg *ifnm = NULL; struct if_nameindex *ifni = NULL, *ifni2; char *cp; - size_t nbytes, needed; + size_t needed; unsigned int ni, i; int mib[6]; diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c index 1fa37e9a3cf..88338eed528 100644 --- a/sbin/fsck_ext2fs/inode.c +++ b/sbin/fsck_ext2fs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.26 2016/04/28 12:17:15 krw Exp $ */ +/* $OpenBSD: inode.c,v 1.27 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -560,7 +560,9 @@ pinode(ino_t ino) { struct ext2fs_dinode *dp; char *p; +#ifndef SMALL struct passwd *pw; +#endif time_t t; u_int32_t uid; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index da059ee1e91..39695b54625 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.47 2015/12/10 17:26:59 mmcc Exp $ */ +/* $OpenBSD: inode.c,v 1.48 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $ */ /* @@ -526,7 +526,9 @@ pinode(ino_t ino) { union dinode *dp; char *p; +#ifndef SMALL struct passwd *pw; +#endif time_t t; printf(" I=%llu ", (unsigned long long)ino); diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 5278ecfd834..570d18414c3 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umount.c,v 1.26 2015/01/16 06:40:01 deraadt Exp $ */ +/* $OpenBSD: umount.c,v 1.27 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */ /*- @@ -145,11 +145,13 @@ int umountfs(char *oname) { struct hostent *hp; +#ifndef NO_NFS struct sockaddr_in saddr; - struct stat sb; struct timeval pertry, try; CLIENT *clp; int so; +#endif + struct stat sb; char *delimp, *hostp, *mntpt; char *name, *newname, rname[PATH_MAX], type[MFSNAMELEN]; diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 678748dad0d..e889575279e 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.151 2016/12/08 19:59:51 millert Exp $ */ +/* $OpenBSD: fetch.c,v 1.152 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -177,7 +177,7 @@ url_get(const char *origline, const char *proxyenv, const char *outfile) char *hosttail, *cause = "unknown", *newline, *host, *port, *buf = NULL; char *epath, *redirurl, *loctail, *h, *p; int error, i, isftpurl = 0, isfileurl = 0, isredirect = 0, rval = -1; - struct addrinfo hints, *res0, *res, *ares = NULL; + struct addrinfo hints, *res0, *res; const char * volatile savefile; char * volatile proxyurl = NULL; char *credentials = NULL; @@ -193,6 +193,7 @@ url_get(const char *origline, const char *proxyenv, const char *outfile) char *locbase, *full_host = NULL; const char *scheme; int ishttpurl = 0, ishttpsurl = 0; + struct addrinfo *ares = NULL; #endif /* !SMALL */ struct tls *tls = NULL; int status; @@ -1456,7 +1457,9 @@ ftp_readline(FILE *fp, struct tls *tls, size_t *lenp) size_t ftp_read(FILE *fp, struct tls *tls, char *buf, size_t len) { +#ifndef SMALL ssize_t tls_ret; +#endif size_t ret = 0; if (fp != NULL) diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 94e83c10f07..adec25ef724 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.112 2016/11/30 07:55:24 mestre Exp $ */ +/* $OpenBSD: main.c,v 1.113 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -160,7 +160,10 @@ int pipeout; int main(volatile int argc, char *argv[]) { - int ch, top, rval; + int ch, rval; +#ifndef SMALL + int top; +#endif struct passwd *pw = NULL; char *cp, homedir[PATH_MAX]; char *outfile = NULL; diff --git a/usr.bin/ftp/small.c b/usr.bin/ftp/small.c index a0015a6eff5..3f85130baaf 100644 --- a/usr.bin/ftp/small.c +++ b/usr.bin/ftp/small.c @@ -1,4 +1,4 @@ -/* $OpenBSD: small.c,v 1.6 2016/05/25 15:36:01 krw Exp $ */ +/* $OpenBSD: small.c,v 1.7 2016/12/16 17:44:59 krw Exp $ */ /* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */ /* @@ -326,13 +326,13 @@ mget(int argc, char *argv[]) { extern int optind, optreset; sig_t oldintr; - int ch, xargc = 2; + int xargc = 2; char *cp, localcwd[PATH_MAX], *xargv[] = { argv[0], NULL, NULL }; static int restartit = 0; #ifndef SMALL extern char *optarg; const char *errstr; - int i = 1; + int ch, i = 1; char type = 0, *dummyargv[] = { argv[0], ".", NULL }; FILE *ftemp = NULL; static int depth = 0, max_depth = 0; |