Skip to content

Commit

Permalink
Remove trailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwgbsd committed May 30, 1995
1 parent 010f541 commit 709e8f9
Show file tree
Hide file tree
Showing 443 changed files with 2,875 additions and 2,869 deletions.
4 changes: 2 additions & 2 deletions etc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
# $Id: Makefile,v 1.115 1995/05/11 05:22:29 jkh Exp $
# $Id: Makefile,v 1.116 1995/05/13 16:58:37 ache Exp $

# disktab may be wrong -- hcx9 is a tahoe, but gets its own.
# -rw-r--r--
Expand Down Expand Up @@ -46,7 +46,7 @@ WCS2= fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual

# Special top level files for FreeBSD
COPYRIGHT= COPYRIGHT
FREEBSD=
FREEBSD=
FREEBSD+= ${COPYRIGHT}
#
# Floppy drive name, mount point, type and parameters for building Floppies
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/gen/pw_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pw_scan(bp, pw)
break;
}
if (!strcmp(p, sh))
break;
break;
}
if(p[0]) pw->pw_fields |= _PWF_SHELL;

Expand Down
4 changes: 2 additions & 2 deletions lib/libutil/pw_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pw_init()
int
pw_lock()
{
/*
/*
* If the master password file doesn't exist, the system is hosed.
* Might as well try to build one. Set the close-on-exec bit so
* that users can't get at the encrypted passwords while editing.
Expand Down Expand Up @@ -167,7 +167,7 @@ pw_edit(notsetuid)
editor = _PATH_VI;
if (p = strrchr(editor, '/'))
++p;
else
else
p = editor;

if (!(editpid = vfork())) {
Expand Down
8 changes: 4 additions & 4 deletions sbin/sysctl/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "From: @(#)sysctl.c 8.1 (Berkeley) 6/6/93"; */
static const char rcsid[] =
"$Id: sysctl.c,v 1.4 1995/02/16 00:28:42 wollman Exp $";
"$Id: sysctl.c,v 1.5 1995/05/12 19:10:56 wollman Exp $";
#endif /* not lint */

#include <sys/param.h>
Expand Down Expand Up @@ -291,7 +291,7 @@ parse(string, flags)
getloadavg(loads, 3);
if (!nflag)
fprintf(stdout, "%s: ", string);
fprintf(stdout, "%.2f %.2f %.2f\n",
fprintf(stdout, "%.2f %.2f %.2f\n",
loads[0], loads[1], loads[2]);
return;
}
Expand Down Expand Up @@ -333,7 +333,7 @@ parse(string, flags)
default:
fprintf(stderr, "Illegal top level value: %d\n", mib[0]);
return;

}
if (bufp) {
fprintf(stderr, "name %s in %s is unknown\n", *bufp, string);
Expand Down Expand Up @@ -404,7 +404,7 @@ parse(string, flags)
}
if (!nflag)
fprintf(stdout, "%s = %s\n", string,
devname(dev,
devname(dev,
(special & CONSDEV) ? S_IFCHR : S_IFBLK));
else
fprintf(stdout, "0x%x\n", dev);
Expand Down
14 changes: 7 additions & 7 deletions usr.sbin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ SUBDIR= ac accton adduser amd arp bootparamd chown chroot cron crunch ctm \
.if make(clean) || make(cleandir)
SUBDIR+=apm apmconf bad144 cdplay config config.new fdformat fdwrite \
fdcontrol iostat kbdcontrol lptcontrol mixer ncrcontrol rtprio \
sgsc spkrtest vidcontrol
sgsc spkrtest vidcontrol
.elif ${MACHINE} == "hp300"
SUBDIR+=config iostat
SUBDIR+=config iostat
.elif ${MACHINE} == "i386"
SUBDIR+=apm apmconf bad144 cdplay config fdformat fdwrite fdcontrol iostat \
kbdcontrol lptcontrol mixer ncrcontrol rtprio sgsc spkrtest \
vidcontrol
.elif ${MACHINE} == "luna68k"
SUBDIR+=config iostat
SUBDIR+=config iostat
.elif ${MACHINE} == "mips"
SUBDIR+=config iostat
SUBDIR+=config iostat
.elif ${MACHINE} == "sparc"
SUBDIR+=config.new eeprom
SUBDIR+=config.new eeprom
.elif ${MACHINE} == "tahoe"
SUBDIR+=config iostat
SUBDIR+=config iostat
.elif ${MACHINE} == "vax"
SUBDIR+=bad144 config iostat
SUBDIR+=bad144 config iostat
.endif

.include <bsd.subdir.mk>
12 changes: 6 additions & 6 deletions usr.sbin/XNSrouted/af.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ xnnet_netmatch(sxn1, sxn2)
xnnet_portmatch(sns)
register struct sockaddr_ns *sns;
{

return (ntohs(sns->sns_addr.x_port) == IDPPORT_RIF );
}

Expand All @@ -116,7 +116,7 @@ xnnet_output(flags, sns, size)
sns->sns_addr.x_port = htons(IDPPORT_RIF);
#ifdef DEBUG
if(do_output || ntohs(msg->rip_cmd) == RIPCMD_REQUEST)
#endif
#endif
/*
* Kludge to allow us to get routes out to machines that
* don't know their addresses yet; send to that address on
Expand All @@ -125,16 +125,16 @@ xnnet_output(flags, sns, size)
if (ns_neteqnn(sns->sns_addr.x_net, ns_zeronet)) {
extern struct interface *ifnet;
register struct interface *ifp;

for (ifp = ifnet; ifp; ifp = ifp->int_next) {
sns->sns_addr.x_net =
sns->sns_addr.x_net =
satons_addr(ifp->int_addr).x_net;
(void) sendto(s, msg, size, flags,
(struct sockaddr *)sns, sizeof (*sns));
}
return;
}

(void) sendto(s, msg, size, flags,
(struct sockaddr *)sns, sizeof (*sns));
}
Expand All @@ -149,7 +149,7 @@ xnnet_checkhost(sns)
{
register struct interface *ifp = if_ifwithnet(sns);
/*
* We want this route if there is no more than one
* We want this route if there is no more than one
* point to point interface with this network.
*/
if (ifp == 0 || (ifp->int_flags & IFF_POINTOPOINT)==0) return (1);
Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/XNSrouted/if.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if_ifwithdstaddr(addr)
}

/*
* Find the interface on the network
* Find the interface on the network
* of the specified address.
*/
struct interface *
Expand Down
10 changes: 5 additions & 5 deletions usr.sbin/XNSrouted/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ union ns_net net;
{
static struct sockaddr_ns sxn;
extern char ether_broadcast_addr[6];

bzero(&sxn, sizeof (struct sockaddr_ns));
sxn.sns_family = AF_NS;
sxn.sns_len = sizeof (sxn);
sxn.sns_addr.x_net = net;
sxn.sns_addr.x_host = *(union ns_host *)ether_broadcast_addr;
return( (struct sockaddr *)&sxn);

}

/*
Expand All @@ -72,13 +72,13 @@ rip_input(from, size)
int newsize;
struct afswitch *afp;


ifp = 0;
TRACE_INPUT(ifp, from, size);
if (from->sa_family >= AF_MAX)
return;
afp = &afswitch[from->sa_family];

size -= sizeof (u_short) /* command */;
n = msg->rip_nets;

Expand All @@ -91,7 +91,7 @@ rip_input(from, size)
break;
size -= sizeof (struct netinfo);

/*
/*
* A single entry with rip_dst == DSTNETS_ALL and
* metric ``infinity'' means ``all routes''.
*/
Expand Down
22 changes: 11 additions & 11 deletions usr.sbin/XNSrouted/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/5/93";
int supplier = -1; /* process should supply updates */
extern int gateway;

struct rip *msg = (struct rip *) &packet[sizeof (struct idp)];
struct rip *msg = (struct rip *) &packet[sizeof (struct idp)];
void hup(), fkexit(), timer();

main(argc, argv)
Expand All @@ -70,7 +70,7 @@ main(argc, argv)
int cc;
struct sockaddr from;
u_char retry;

argv0 = argv;
argv++, argc--;
while (argc > 0 && **argv == '-') {
Expand All @@ -93,7 +93,7 @@ main(argc, argv)
tracepackets++;
argv++, argc--;
ftrace = stderr;
tracing = 1;
tracing = 1;
continue;
}
if (strcmp(*argv, "-g") == 0) {
Expand All @@ -110,8 +110,8 @@ main(argc, argv)
"usage: xnsrouted [ -s ] [ -q ] [ -t ] [ -g ] [ -l ]\n");
exit(1);
}


#ifndef DEBUG
if (!tracepackets)
daemon(0, 0);
Expand Down Expand Up @@ -161,11 +161,11 @@ main(argc, argv)
signal(SIGINT, hup);
signal(SIGEMT, fkexit);
timer();


for (;;)

for (;;)
process(s);

}

process(fd)
Expand All @@ -185,7 +185,7 @@ process(fd)
fprintf(ftrace,"rcv %d bytes on %s ", cc, xns_ntoa(&idp->idp_dna));
fprintf(ftrace," from %s\n", xns_ntoa(&idp->idp_sna));
}

if (noteremoterequests && !ns_neteqnn(idp->idp_sna.x_net, ns_zeronet)
&& !ns_neteq(idp->idp_sna, idp->idp_dna))
{
Expand All @@ -194,7 +194,7 @@ process(fd)
xns_nettoa(idp->idp_dna.x_net),
xns_nettoa(idp->idp_sna.x_net));
}

/* We get the IDP header in front of the RIF packet*/
cc -= sizeof (struct idp);
#define mask(s) (1<<((s)-1))
Expand All @@ -204,7 +204,7 @@ process(fd)
}

getsocket(type, proto, sns)
int type, proto;
int type, proto;
struct sockaddr_ns *sns;
{
int domain = sns->sns_family;
Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/XNSrouted/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct rip {
u_short rip_cmd; /* request/response */
struct netinfo rip_nets[1]; /* variable length */
};

/*
* Packet types.
*/
Expand Down
8 changes: 4 additions & 4 deletions usr.sbin/XNSrouted/startup.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ ifinit()
}
ifs.int_dstaddr = *brdaddr;
}
/*
* already known to us?
/*
* already known to us?
* what makes a POINTOPOINT if unique is its dst addr,
* NOT its source address
* NOT its source address
*/
if ( ((ifs.int_flags & IFF_POINTOPOINT) &&
if_ifwithdstaddr(&ifs.int_dstaddr)) ||
Expand Down Expand Up @@ -243,7 +243,7 @@ addrouteforif(ifp)
int (*match)();
register struct interface *ifp2 = ifnet;
register struct interface *ifprev = ifnet;

dst = &ifp->int_dstaddr;

/* Search for interfaces with the same net */
Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/XNSrouted/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ timer()
for (; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {
/*
* We don't advance time on a routing entry for
* a passive gateway or that for our only interface.
* a passive gateway or that for our only interface.
* The latter is excused because we don't act as
* a routing information supplier and hence would
* time it out. This is fair as if it's down
Expand Down
6 changes: 3 additions & 3 deletions usr.sbin/XNSrouted/tools/query.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ char *argv[];
struct sockaddr from;
int fromlen = sizeof(from);
struct timeval notime;

if (argc < 2) {
printf("usage: query hosts...\n");
exit(1);
Expand All @@ -96,7 +96,7 @@ char *argv[];
bzero(&notime, sizeof(notime));
signal(SIGALRM, timeout);
alarm(WTIME);
while (!timedout ||
while (!timedout ||
select(20, &bits, 0, 0, &notime) > 0) {
struct nspacket {
struct idp hdr;
Expand Down Expand Up @@ -191,7 +191,7 @@ timeout()
timedout = 1;
}
getsocket(type, proto)
int type, proto;
int type, proto;
{
struct sockaddr_ns *sns = &myaddr;
int domain = sns->sns_family;
Expand Down
6 changes: 3 additions & 3 deletions usr.sbin/XNSrouted/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ struct ns_addr *addr;

(void)sprintf(buf, "%s#%x:%x:%x:%x:%x:%x",
xns_nettoa(addr->x_net),
addr->x_host.c_host[0], addr->x_host.c_host[1],
addr->x_host.c_host[2], addr->x_host.c_host[3],
addr->x_host.c_host[0], addr->x_host.c_host[1],
addr->x_host.c_host[2], addr->x_host.c_host[3],
addr->x_host.c_host[4], addr->x_host.c_host[5]);

return(buf);
}
Loading

0 comments on commit 709e8f9

Please sign in to comment.