diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index d216cd533442..a4618c43c5a9 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; */ static const char rcsid[] = - "$Id: ifconfig.c,v 1.32 1997/10/27 03:28:44 steve Exp $"; + "$Id: ifconfig.c,v 1.33 1997/12/24 00:57:41 imp Exp $"; #endif /* not lint */ #include @@ -1035,7 +1035,8 @@ in_getaddr(s, which) if (inet_aton(s, &sin->sin_addr)) return; if ((hp = gethostbyname(s)) != 0) - bcopy(hp->h_addr, (char *)&sin->sin_addr, MIN(hp->h_length, sizeof(sin->sin_addr))); + bcopy(hp->h_addr, (char *)&sin->sin_addr, + MIN(hp->h_length, sizeof(sin->sin_addr))); else if ((np = getnetbyname(s)) != 0) sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY); else diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 246c40a7f6ba..7a4a45363d26 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -45,7 +45,7 @@ static char copyright[] = static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; */ static const char rcsid[] = - "$Id: mount_nfs.c,v 1.24 1997/10/19 16:40:01 joerg Exp $"; + "$Id: mount_nfs.c,v 1.25 1997/12/24 00:58:39 imp Exp $"; #endif /* not lint */ #include @@ -694,7 +694,8 @@ getnfsargs(spec, nfsargsp) return (0); } } else if ((hp = gethostbyname(hostp)) != NULL) - memmove(&saddr.sin_addr, hp->h_addr, MIN(hp->h_length, sizeof(saddr.sin_addr))); + memmove(&saddr.sin_addr, hp->h_addr, + MIN(hp->h_length, sizeof(saddr.sin_addr))); else { warnx("can't get net id for host"); return (0); @@ -706,7 +707,8 @@ getnfsargs(spec, nfsargsp) warnx("can't reverse resolve net address"); return (0); } - memmove(&saddr.sin_addr, hp->h_addr, MIN(hp->h_length, sizeof(saddr.sin_addr))); + memmove(&saddr.sin_addr, hp->h_addr, + MIN(hp->h_length, sizeof(saddr.sin_addr))); strncpy(inst, hp->h_name, INST_SZ); inst[INST_SZ - 1] = '\0'; if (cp = strchr(inst, '.')) diff --git a/sbin/route/route.c b/sbin/route/route.c index a0b00f1d9749..e08ba3a2fa00 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -43,7 +43,7 @@ static const char copyright[] = static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94"; */ static const char rcsid[] = - "$Id: route.c,v 1.26 1997/07/18 09:05:12 julian Exp $"; + "$Id: route.c,v 1.27 1997/12/24 00:59:49 imp Exp $"; #endif /* not lint */ #include @@ -920,7 +920,7 @@ getaddr(which, s, hpp) *hpp = hp; su->sin.sin_family = hp->h_addrtype; bcopy(hp->h_addr, (char *)&su->sin.sin_addr, - MIN(hp->h_length, sizeof(su->sin.sin_addr))); + MIN(hp->h_length, sizeof(su->sin.sin_addr))); return (1); } errx(EX_NOHOST, "bad address: %s", s); diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 9b4c472a772e..fe42c19cd3bd 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -280,7 +280,8 @@ umountfs(name, typelist) memset(&saddr, 0, sizeof(saddr)); saddr.sin_family = AF_INET; saddr.sin_port = 0; - memmove(&saddr.sin_addr, hp->h_addr, MIN(hp->h_length, sizeof(saddr.sin_addr))); + memmove(&saddr.sin_addr, hp->h_addr, + MIN(hp->h_length, sizeof(saddr.sin_addr))); pertry.tv_sec = 3; pertry.tv_usec = 0; so = RPC_ANYSOCK;