From f7f1b83409d4a3646b29666e18dd21b77190af19 Mon Sep 17 00:00:00 2001 From: krw Date: Sat, 21 Jan 2017 08:33:51 +0000 Subject: Nuke whitespace foolish enough to expose itself during the great "warning:" rectification. --- usr.sbin/amd/amq/amq.c | 8 ++++---- usr.sbin/mopd/common/device.c | 4 ++-- usr.sbin/mopd/common/dl.c | 6 +++--- usr.sbin/mopd/common/file.c | 16 ++++++++-------- usr.sbin/mopd/common/mopdef.h | 38 +++++++++++++++++++------------------- usr.sbin/mopd/mopa.out/mopa.out.c | 24 ++++++++++++------------ usr.sbin/mrouted/main.c | 2 +- usr.sbin/mtrace/mtrace.c | 26 +++++++++++++------------- usr.sbin/rpc.statd/procs.c | 4 ++-- usr.sbin/rpc.statd/statd.c | 28 ++++++++++++++-------------- usr.sbin/rpc.statd/test.c | 4 ++-- 11 files changed, 80 insertions(+), 80 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c index 9490d678141..972d4ef2c0b 100644 --- a/usr.sbin/amd/amq/amq.c +++ b/usr.sbin/amd/amq/amq.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)amq.c 8.1 (Berkeley) 6/7/93 - * $Id: amq.c,v 1.20 2016/12/20 22:19:08 krw Exp $ + * $Id: amq.c,v 1.21 2017/01/21 08:33:51 krw Exp $ */ /* @@ -290,11 +290,11 @@ main(int argc, char *argv[]) if (unmount_flag) errs = 1; } - + if (errs) { show_usage: fprintf(stderr, "usage: %s [-fmsuv] [-h hostname] " - "[directory ...]\n", __progname); + "[directory ...]\n", __progname); exit(1); } @@ -523,7 +523,7 @@ show_usage: } /* - * udpresport creates a datagram socket and attempts to bind it to a + * udpresport creates a datagram socket and attempts to bind it to a * secure port. * returns: The bound socket, or -1 to indicate an error. */ diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c index 8aeb17b640e..5135f4dd05d 100644 --- a/usr.sbin/mopd/common/device.c +++ b/usr.sbin/mopd/common/device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: device.c,v 1.16 2013/11/24 21:32:31 deraadt Exp $ */ +/* $OpenBSD: device.c,v 1.17 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -157,7 +157,7 @@ deviceInitOne(char *ifname) snprintf(interface, sizeof(interface), "%s", ifname); #endif /* _AIX */ - /* Ok, init it just once */ + /* Ok, init it just once */ p = iflist; for (p = iflist; p; p = p->next) if (strcmp(p->if_name, interface) == 0) diff --git a/usr.sbin/mopd/common/dl.c b/usr.sbin/mopd/common/dl.c index 76baa16fd83..3b7c616cde7 100644 --- a/usr.sbin/mopd/common/dl.c +++ b/usr.sbin/mopd/common/dl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl.c,v 1.9 2016/12/25 16:40:06 krw Exp $ */ +/* $OpenBSD: dl.c,v 1.10 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -15,9 +15,9 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c index 170dded7d5f..65c016b3f95 100644 --- a/usr.sbin/mopd/common/file.c +++ b/usr.sbin/mopd/common/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.17 2014/12/13 14:44:59 miod Exp $ */ +/* $OpenBSD: file.c,v 1.18 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -891,12 +891,12 @@ CheckAOutFile(int fd) return(-1); (void)lseek(fd, (off_t) 0, SEEK_SET); - + if (read(fd, (char *)&ex_swap, sizeof(ex_swap)) != sizeof(ex_swap)) return(-1); (void)lseek(fd, (off_t) 0, SEEK_SET); - + mid = getMID(mid, N_GETMID (ex)); if (mid == -1) { @@ -1227,7 +1227,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf) len = 0; total = dlslot->a_text; - + if (pos < total) { notdone = total - pos; if (notdone <= bsz) { @@ -1256,7 +1256,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf) } total = total + dlslot->a_data; - + if ((bsz > 0) && (pos < total)) { notdone = total - pos; if (notdone <= bsz) { @@ -1283,7 +1283,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf) pos = pos + outlen; bsz = bsz - outlen; } - + total = total + dlslot->a_bss; if ((bsz > 0) && (pos < total)) { @@ -1298,7 +1298,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf) pos = pos + outlen; bsz = bsz - outlen; } - + total = total + dlslot->a_bss_fill; if ((bsz > 0) && (pos < total)) { @@ -1313,7 +1313,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf) pos = pos + outlen; bsz = bsz - outlen; } - + dlslot->a_lseek = pos; break; diff --git a/usr.sbin/mopd/common/mopdef.h b/usr.sbin/mopd/common/mopdef.h index 389656ce9f1..1ec3a8b99be 100644 --- a/usr.sbin/mopd/common/mopdef.h +++ b/usr.sbin/mopd/common/mopdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 maja Exp $ */ +/* $OpenBSD: mopdef.h,v 1.6 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 maja Exp $ + * $OpenBSD: mopdef.h,v 1.6 2017/01/21 08:33:51 krw Exp $ * */ @@ -48,7 +48,7 @@ /* The following constants are defined in module MOPDEF.SDL in MOM */ -#define MOP_K_CODE_MIN 0 +#define MOP_K_CODE_MIN 0 #define MOP_K_CODE_MLT 0 /* Memory Load with transfer address */ #define MOP_K_CODE_DCM 1 /* Dump Complete */ #define MOP_K_CODE_MLD 2 /* Memory Load */ @@ -71,38 +71,38 @@ #define MOP_K_CODE_PLT 20 /* Parameter load with transfer address*/ #define MOP_K_CODE_ALD 24 /* Active loop data */ #define MOP_K_CODE_PLD 26 /* Passive looped data */ -#define MOP_K_CODE_MAX 26 +#define MOP_K_CODE_MAX 26 -#define MOP_K_PGTY_MIN 0 +#define MOP_K_PGTY_MIN 0 #define MOP_K_PGTY_SECLDR 0 /* Secondary Loader */ #define MOP_K_PGTY_TERLDR 1 /* Tertiary Loader */ #define MOP_K_PGTY_OPRSYS 2 /* Operating System */ #define MOP_K_PGTY_MGNTFL 3 /* Management File */ -#define MOP_K_PGTY_MAX 3 +#define MOP_K_PGTY_MAX 3 -#define MOP_K_BPTY_MIN 0 +#define MOP_K_BPTY_MIN 0 #define MOP_K_BPTY_SYS 0 /* System Processor */ #define MOP_K_BPTY_COM 1 /* Communication Processor */ #define MOP_K_BPTY_MAX 1 -#define MOP_K_RML_ERROR_MIN 0 +#define MOP_K_RML_ERROR_MIN 0 #define MOP_K_RML_ERROR_NONE 0 /* None */ #define MOP_K_RML_ERROR_NO_LOAD 1 /* Image data not properly loaded */ -#define MOP_K_RML_ERROR_MAX 1 +#define MOP_K_RML_ERROR_MAX 1 -#define MOP_K_PLTP_MIN 0 +#define MOP_K_PLTP_MIN 0 #define MOP_K_PLTP_END 0 /* End Mark */ #define MOP_K_PLTP_TSN 1 /* Target System Name */ #define MOP_K_PLTP_TSA 2 /* Target System Address */ #define MOP_K_PLTP_HSN 3 /* Host System Name */ #define MOP_K_PLTP_HSA 4 /* Host System Address */ #define MOP_K_PLTP_HST 5 /* Host System Time */ -#define MOP_K_PLTP_MAX 5 +#define MOP_K_PLTP_MAX 5 -#define MOP_K_BOT_CNTL_MIN 0 +#define MOP_K_BOT_CNTL_MIN 0 #define MOP_K_BOT_CNTL_SERVER 0 /* Boot-Server */ #define MOP_K_BOT_CNTL_DEVICE 1 /* Boot-Device */ -#define MOP_K_BOT_CNTL_MAX 1 +#define MOP_K_BOT_CNTL_MAX 1 #define MOP_K_INFO_VER 1 /* Maintenance Version */ #define MOP_K_INFO_MFCT 2 /* Maintenance Functions */ @@ -118,26 +118,26 @@ #define MOP_K_INFO_DLTY 400 /* Data Link Type */ #define MOP_K_INFO_DLBSZ 401 /* Data Link Buffer Size */ -#define MOP_K_DLTY_MIN 1 +#define MOP_K_DLTY_MIN 1 #define MOP_K_DLTY_NI 1 /* Ethernet */ #define MOP_K_DLTY_DDCMP 2 /* DDCMP */ #define MOP_K_DLTY_LAPB 3 /* LAPB (frame level of X.25) */ -#define MOP_K_DLTY_MAX 3 +#define MOP_K_DLTY_MAX 3 -#define MOP_K_PRTY_MIN 0 +#define MOP_K_PRTY_MIN 0 #define MOP_K_PRTY_11 1 /* PDP-11 (UNIBUS) */ #define MOP_K_PRTY_CMSV 2 /* Communication Server */ #define MOP_K_PRTY_PRO 3 /* Professional */ #define MOP_K_PRTY_SCO 4 /* Scorpio */ #define MOP_K_PRTY_AMB 5 /* Amber */ #define MOP_K_PRTY_BRI 6 /* XLII Bridge */ -#define MOP_K_PRTY_MAX 6 +#define MOP_K_PRTY_MAX 6 -#define MOP_K_SFID_FORM_MIN -2 +#define MOP_K_SFID_FORM_MIN -2 #define MOP_K_SFID_FORM_MAINT -2 /* Maintenance System */ #define MOP_K_SFID_FORM_OPRSYS -1 /* Standard Operating System */ #define MOP_K_SFID_FORM_NONE 0 /* None */ -#define MOP_K_SFID_FORM_MAX 0 +#define MOP_K_SFID_FORM_MAX 0 #define MOP_K_SFID_CUST 'CP' /* Customer product */ #define MOP_K_SFID_DEC 'DP' /* DEC product */ diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c index 9598907ba0e..e6471cd3c86 100644 --- a/usr.sbin/mopd/mopa.out/mopa.out.c +++ b/usr.sbin/mopd/mopa.out/mopa.out.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopa.out.c,v 1.15 2016/12/20 22:19:08 krw Exp $ */ +/* $OpenBSD: mopa.out.c,v 1.16 2017/01/21 08:33:51 krw Exp $ */ /* * mopa.out - Convert a Unix format kernel into something that @@ -10,10 +10,10 @@ * * If necessary, the a.out header is stripped, and the program * segments are padded out. The BSS segment is zero filled. - * A header is prepended that looks like an IHD header. In + * A header is prepended that looks like an IHD header. In * particular the Unix machine ID is placed where mopd expects * the image type to be (offset is IHD_W_ALIAS). If the machine - * ID could be mistaken for a DEC image type, then the conversion + * ID could be mistaken for a DEC image type, then the conversion * is aborted. The original a.out header is copied into the front * of the header so that once we have detected the Unix machine * ID we can haul the load address and the xfer address out. @@ -92,21 +92,21 @@ main (int argc, char **argv) int i, j; struct dllist dl; short image_type; - + #ifdef NOAOUT fprintf(stderr, "%s: has no function in OS/BSD\n", argv[0]); return(1); -#endif +#endif if (argc != 3) { fprintf (stderr, "usage: %s infile outfile\n", argv[0]); return (1); } - + dl.ldfd = open (argv[1], O_RDONLY); if (dl.ldfd == -1) err(2, "open `%s'", argv[1]); - + if (GetFileInfo(&dl, 0) == -1) errx(3, "`%s' is an unknown file type", argv[1]); @@ -192,13 +192,13 @@ main (int argc, char **argv) mopFilePutLX(header, 0xd4 + EISD_L_SECSIZE, i, 4); break; } - + out = fopen (argv[2], "w"); if (!out) err(2, "writing `%s'", argv[2]); - + /* Now we do the actual work. Write MOP-image header */ - + fwrite (header, sizeof (header), 1, out); switch (dl.image_type) { @@ -229,11 +229,11 @@ main (int argc, char **argv) default: break; } - + while ((i = mopFileRead(&dl,header)) > 0) { (void)fwrite(header, i, 1, out); } - + fclose (out); exit(0); } diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c index 299fab4ef31..144fa558092 100644 --- a/usr.sbin/mrouted/main.c +++ b/usr.sbin/mrouted/main.c @@ -115,7 +115,7 @@ main(int argc, char *argv[]) } argc -= optind; argv += optind; - + if (argc > 0) { usage: fprintf(stderr, "usage: mrouted [-p] [-c config_file] [-d [debug_level]]\n"); diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c index b6fc3913c94..717c251c20c 100644 --- a/usr.sbin/mtrace/mtrace.c +++ b/usr.sbin/mtrace/mtrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrace.c,v 1.37 2016/08/03 23:37:25 krw Exp $ */ +/* $OpenBSD: mtrace.c,v 1.38 2017/01/21 08:33:51 krw Exp $ */ /* $NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $ */ /* @@ -9,7 +9,7 @@ * about packet rate and loss for each hop along the path. It can * usually be invoked just as * - * mtrace source + * mtrace source * * to trace the route from that source to the local host for a default * group when only the route is desired and not group-specific packet @@ -21,7 +21,7 @@ * Xerox PARC). It attempts to parallel in command syntax and output * format the unicast traceroute program written by Van Jacobson (LBL) * for the parts where that makes sense. - * + * * Copyright (c) 1998-2001. * The University of Southern California/Information Sciences Institute. * All rights reserved. @@ -170,7 +170,7 @@ inet_name(u_int32_t addr) } -u_int32_t +u_int32_t host_addr(char *name) { struct hostent *e = NULL; @@ -261,7 +261,7 @@ flag_type(u_int type) (void) snprintf(buf, sizeof buf, "Unknown error code %d", type); return (buf); } -} +} /* * If destination is on a local net, get the netmask, else set the @@ -284,7 +284,7 @@ get_netmask(int s, u_int32_t dst) return (retval); } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family != AF_INET) + if (ifa->ifa_addr->sa_family != AF_INET) continue; if_addr = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr; if_mask = ((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr.s_addr; @@ -973,7 +973,7 @@ fixup_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new) res = ((ntohl(n->tr_pktcnt) < ntohl(b->tr_pktcnt)) || (ntohl(n->tr_pktcnt) < ntohl(p->tr_pktcnt))); if (debug > 2) - printf("\t\tr=%d, res=%d\n", *r, res); + printf("\t\tr=%d, res=%d\n", *r, res); if (*r) { if (res || *r > 1) { /* @@ -1082,7 +1082,7 @@ print_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new) if (ttl < n->tr_fttl) ttl = n->tr_fttl; else ++ttl; } - + printf(" %c \\__ ttl%5d ", first ? 'v' : '|', ttl); stat_line(p, n, FALSE, r); if (!first) { @@ -1288,7 +1288,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\ } #ifdef SUNOS5 - /* + /* * SunOS 5.X prior to SunOS 2.6, getsockname returns 0 for udp socket. * This call to sysinfo will return the hostname. * If the default multicast interface (set with the route @@ -1299,7 +1299,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\ char myhostname[HOST_NAME_MAX+1]; struct hostent *hp; int error; - + error = sysinfo(SI_HOSTNAME, myhostname, sizeof(myhostname)); if (error == -1) { perror("Getting my hostname"); @@ -1347,7 +1347,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\ } /* - * If the response is to be a multicast address, make sure we + * If the response is to be a multicast address, make sure we * are listening on that multicast address. */ if (raddr) { @@ -1386,7 +1386,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\ hops = qno; tries = nqueries; printf("Querying reverse path, maximum %d hops... ", qno); - fflush(stdout); + fflush(stdout); } base.rtime = 0; base.len = 0; @@ -1462,7 +1462,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\ r = base.resps + base.len - 1; if (base.len == hops && (hops == 1 || (base.resps+nexthop-2)->tr_outaddr == lastout)) { - if (hops == nexthop) { + if (hops == nexthop) { print_trace(-hops, &base); } else { printf("\nResuming...\n"); diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c index 548d797d49e..54a0a5e3b1a 100644 --- a/usr.sbin/rpc.statd/procs.c +++ b/usr.sbin/rpc.statd/procs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procs.c,v 1.2 2015/08/20 22:39:29 deraadt Exp $ */ +/* $OpenBSD: procs.c,v 1.3 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1995 @@ -143,7 +143,7 @@ sm_mon_1_svc(mon *arg, struct svc_req *req) * In the unlikely event of more than one identical monitor * request, all are removed. */ -int +int do_unmon(char *name, HostInfo *hp, void *ptr) { my_id *idp = ptr; diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c index cf9624d63ab..46bc1343513 100644 --- a/usr.sbin/rpc.statd/statd.c +++ b/usr.sbin/rpc.statd/statd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: statd.c,v 1.3 2017/01/20 01:12:44 krw Exp $ */ +/* $OpenBSD: statd.c,v 1.4 2017/01/21 08:33:51 krw Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -58,8 +58,8 @@ #include "statd.h" struct sigaction sa; -int debug = 0; /* Controls syslog() for debug msgs */ -int _rpcsvcdirty = 0; /* XXX ??? */ +int debug = 0; /* Controls syslog() for debug msgs */ +int _rpcsvcdirty = 0; /* XXX ??? */ static DB *db; /* Database file */ Header status_info; @@ -176,7 +176,7 @@ main(int argc, char **argv) * of SM_NOTIFY to other systems, so it is normal for the * children to exit when they have done their work. */ -void +void notify_handler(int sig) { time_t now; @@ -206,7 +206,7 @@ notify_handler(int sig) * Purpose: Packaged call of msync() to flush changes to mmap()ed file * Returns: Nothing. Errors to syslog. */ -void +void sync_file() { DBT data; @@ -308,7 +308,7 @@ bad: /* * Purpose: Call the given function if the element is valid * Returns: Nothing - exits on error - * Notes: + * Notes: */ static int walk_one(int (*fun)(DBT *, HostInfo *, void *), DBT *key, DBT *data, void *ptr) @@ -329,7 +329,7 @@ walk_one(int (*fun)(DBT *, HostInfo *, void *), DBT *key, DBT *data, void *ptr) /* * Purpose: Iterate over all elements calling the given function * Returns: -1 if function failed, 0 on success - * Notes: + * Notes: */ static int walk_db(int (*fun)(DBT *, HostInfo *, void *), void *ptr) @@ -379,7 +379,7 @@ bad: * that the host was previously monitored is recorded by * setting the notifyReqd flag, which will in due course * cause a SM_NOTIFY to be sent. - * + * * Note that if we crash twice in quick succession, some hosts * may already have notifyReqd set, where we didn't manage to * notify them before the second crash occurred. @@ -400,7 +400,7 @@ reset_host(DBT *key, HostInfo *hi, void *ptr) /* * Purpose: Check if there is work to be done. * Returns: 0 if there is no work to be done -1 if there is. - * Notes: + * Notes: */ static int check_work(DBT *key, HostInfo *hi, void *ptr) @@ -412,7 +412,7 @@ check_work(DBT *key, HostInfo *hi, void *ptr) /* * Purpose: Unmonitor a host * Returns: 0 - * Notes: + * Notes: */ static int unmon_host(DBT *key, HostInfo *hi, void *ptr) @@ -428,7 +428,7 @@ unmon_host(DBT *key, HostInfo *hi, void *ptr) /* * Purpose: Notify one host. * Returns: 0 if success -1 on failure - * Notes: + * Notes: */ static int notify_one(DBT *key, HostInfo *hi, void *ptr) @@ -487,12 +487,12 @@ notify_one(DBT *key, HostInfo *hi, void *ptr) * all hosts that had a monitor list, and incrementing * the state number to the next even value. */ -static void +static void init_file(char *filename) { DBT data; - db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH, + db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH, NULL); if (db == NULL) err(1, "Cannot open `%s'", filename); @@ -553,7 +553,7 @@ unmon_hosts(void) sync_file(); } -static int +static int notify_one_host(char *hostname) { struct timeval timeout = {20, 0}; /* 20 secs timeout */ diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c index c0aad1e8482..749166aa10d 100644 --- a/usr.sbin/rpc.statd/test.c +++ b/usr.sbin/rpc.statd/test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test.c,v 1.1 2008/06/15 04:43:28 sturm Exp $ */ +/* $OpenBSD: test.c,v 1.2 2017/01/21 08:33:51 krw Exp $ */ #include #include @@ -83,7 +83,7 @@ sm_simu_crash_1(argp, clnt) } -int +int main(argc, argv) int argc; char **argv; -- cgit v1.2.3-59-g8ed1b