From 593df3da4c96cd919f3d066377a69f5f422f00a6 Mon Sep 17 00:00:00 2001 From: lukem Date: Fri, 17 Oct 1997 10:28:39 +0000 Subject: [PATCH] WARNSify --- usr.sbin/mdsetimage/mdsetimage.8 | 6 +++--- usr.sbin/mdsetimage/mdsetimage.c | 11 +++++++---- usr.sbin/mrouted/callout.c | 7 +++++-- usr.sbin/mrouted/defs.h | 11 ++++++++++- usr.sbin/mrouted/igmp.c | 3 ++- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/usr.sbin/mdsetimage/mdsetimage.8 b/usr.sbin/mdsetimage/mdsetimage.8 index 13692910dbbd..42e8f4cfdaed 100644 --- a/usr.sbin/mdsetimage/mdsetimage.8 +++ b/usr.sbin/mdsetimage/mdsetimage.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdsetimage.8,v 1.3 1997/09/30 06:20:17 scottr Exp $ +.\" $NetBSD: mdsetimage.8,v 1.4 1997/10/17 10:28:39 lukem Exp $ .\" .\" Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. .\" @@ -35,14 +35,14 @@ .Nm mdsetimage .Nd set kernel RAM disk image .Sh SYNOPSIS -.Nm mdsetimage +.Nm .Op Fl T Ar address .Op Fl v .Ar kernel .Ar image .Sh DESCRIPTION The -.Nm mdsetimage +.Nm command copies the disk image specified by .Ar image into the memory disk storage area in diff --git a/usr.sbin/mdsetimage/mdsetimage.c b/usr.sbin/mdsetimage/mdsetimage.c index 2c305e77780a..542726a0b33e 100644 --- a/usr.sbin/mdsetimage/mdsetimage.c +++ b/usr.sbin/mdsetimage/mdsetimage.c @@ -1,4 +1,4 @@ -/* $NetBSD: mdsetimage.c,v 1.5 1997/09/30 06:20:18 scottr Exp $ */ +/* $NetBSD: mdsetimage.c,v 1.6 1997/10/17 10:28:44 lukem Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -30,13 +30,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.\n"; +__COPYRIGHT( + "@(#) Copyright (c) 1996 Christopher G. Demetriou.\ + All rights reserved.\n"); #endif /* not lint */ #ifndef lint -static char *rcsid = "$NetBSD: mdsetimage.c,v 1.5 1997/09/30 06:20:18 scottr Exp $"; +__RCSID("$NetBSD: mdsetimage.c,v 1.6 1997/10/17 10:28:44 lukem Exp $"); #endif /* not lint */ #include @@ -48,6 +50,7 @@ static char *rcsid = "$NetBSD: mdsetimage.c,v 1.5 1997/09/30 06:20:18 scottr Exp #include #include #include +#include #include #include "extern.h" diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c index 9c3acf02202d..d2ba74699d7a 100644 --- a/usr.sbin/mrouted/callout.c +++ b/usr.sbin/mrouted/callout.c @@ -1,4 +1,4 @@ -/* $NetBSD: callout.c,v 1.3 1995/12/10 10:06:56 mycroft Exp $ */ +/* $NetBSD: callout.c,v 1.4 1997/10/17 10:37:55 lukem Exp $ */ /* * The mrouted program is covered by the license in the accompanying file @@ -31,6 +31,8 @@ static void print_Q __P((void)); #define print_Q() #endif +int secs_remaining __P((int)); + void callout_init() { @@ -208,8 +210,9 @@ print_Q() log(LOG_DEBUG,0,"(%d,%d) ", ptr->id, ptr->time); } #endif /* IGMP_DEBUG */ + int -secs_remaining( timer_id) +secs_remaining(timer_id) int timer_id; { struct timeout_q *ptr; diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index 27172d990bee..8708b89219ef 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.6 1995/12/10 10:06:59 mycroft Exp $ */ +/* $NetBSD: defs.h,v 1.7 1997/10/17 10:38:03 lukem Exp $ */ /* * The mrouted program is covered by the license in the accompanying file @@ -240,6 +240,7 @@ extern void config_vifs_from_file __P((void)); /* inet.c */ extern int inet_valid_host __P((u_int32_t naddr)); +extern int inet_valid_mask __P((u_int32_t mask)); extern int inet_valid_subnet __P((u_int32_t nsubnet, u_int32_t nmask)); extern char * inet_fmt __P((u_int32_t addr, char *s)); extern char * inet_fmts __P((u_int32_t addr, u_int32_t mask, char *s)); @@ -273,6 +274,7 @@ extern void accept_g_ack __P((u_int32_t src, u_int32_t dst, char *p, extern void accept_mtrace __P((u_int32_t src, u_int32_t dst, u_int32_t group, char *data, u_int no, int datalen)); +extern int find_src_grp __P((u_int32_t, u_int32_t, u_int32_t)); /* kern.c */ extern void k_set_rcvbuf __P((int bufsize)); @@ -311,3 +313,10 @@ extern void rsrr_clean __P((void)); extern void rsrr_cache_send __P((struct gtable *gt, int notify)); extern void rsrr_cache_clean __P((struct gtable *gt)); #endif /* RSRR */ + +/* vif.c */ +extern void accept_info_reply __P((u_int32_t, u_int32_t, + u_char *, int)); +extern void accept_info_request __P((u_int32_t, u_int32_t, + u_char *, int)); +extern void init_installvifs __P((void)); diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c index 1b623ba42ffb..e464c7efff0d 100644 --- a/usr.sbin/mrouted/igmp.c +++ b/usr.sbin/mrouted/igmp.c @@ -1,4 +1,4 @@ -/* $NetBSD: igmp.c,v 1.5 1995/12/10 10:07:01 mycroft Exp $ */ +/* $NetBSD: igmp.c,v 1.6 1997/10/17 10:38:10 lukem Exp $ */ /* * The mrouted program is covered by the license in the accompanying file @@ -311,6 +311,7 @@ send_igmp(src, dst, type, code, group, datalen) struct igmp *igmp; int setloop; + setloop = 0; ip = (struct ip *)send_buf; ip->ip_src.s_addr = src; ip->ip_dst.s_addr = dst;