diff options
-rw-r--r-- | sys/ddb/db_input.c | 4 | ||||
-rw-r--r-- | sys/ddb/db_output.c | 9 | ||||
-rw-r--r-- | sys/ddb/ddb.h | 3 | ||||
-rw-r--r-- | sys/kern/subr_disklabel.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_prf.c | 8 | ||||
-rw-r--r-- | sys/kern/uipc_proto.c | 4 | ||||
-rw-r--r-- | sys/net/rtsock.c | 4 | ||||
-rw-r--r-- | sys/netinet/ip_fw.c | 11 | ||||
-rw-r--r-- | sys/netinet/ip_input.c | 7 | ||||
-rw-r--r-- | sys/sys/systm.h | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_disksubr.c | 4 |
12 files changed, 40 insertions, 26 deletions
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 16c1467..f71ed8a 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_input.c,v 1.11 1995/12/10 13:32:37 phk Exp $ + * $Id: db_input.c,v 1.12 1995/12/10 19:07:59 bde Exp $ */ /* @@ -221,7 +221,7 @@ db_readline(lstart, lsize) while (!db_inputchar(cngetc())) continue; - db_putchar('\n'); /* synch output position */ + db_printf("\n"); /* synch output position */ *db_le = 0; return (db_le - db_lbuf_start); diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index dec12eb..fd12dd8 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.c,v 1.16 1996/01/15 22:39:35 phk Exp $ + * $Id: db_output.c,v 1.17 1996/01/23 21:17:59 phk Exp $ */ /* @@ -63,6 +63,8 @@ int db_tab_stop_width = 8; /* how wide are tab stops? */ ((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width) int db_max_width = 80; /* output line width */ +static void db_putchar __P((int c, void *arg)); + /* * Force pending whitespace. */ @@ -91,9 +93,10 @@ db_force_whitespace() /* * Output character. Buffer whitespace. */ -void -db_putchar(c) +static void +db_putchar(c, arg) int c; /* character to output */ + void * arg; { if (c > ' ' && c <= '~') { /* diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index c231ac4..9ebb68c 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ddb.h,v 1.9 1995/12/07 12:45:08 davidg Exp $ + * $Id: ddb.h,v 1.10 1995/12/10 13:32:43 phk Exp $ */ /* @@ -73,7 +73,6 @@ boolean_t db_map_current __P((struct vm_map *)); boolean_t db_map_equal __P((struct vm_map *, struct vm_map *)); void db_print_loc_and_inst __P((db_addr_t loc)); void db_printf __P((const char *fmt, ...)); -void db_putchar __P((int c)); void db_read_bytes __P((vm_offset_t addr, int size, char *data)); /* machine-dependent */ int db_readline __P((char *lstart, int lsize)); diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index e02db04..7026b91 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.23 1996/04/19 19:34:19 bde Exp $ + * $Id: ufs_disksubr.c,v 1.24 1996/05/03 15:05:17 phk Exp $ */ #include <sys/param.h> @@ -370,7 +370,7 @@ diskerr(bp, dname, what, pri, blkdone, lp) int unit = dkunit(bp->b_dev); int slice = dkslice(bp->b_dev); int part = dkpart(bp->b_dev); - register void (*pr) __P((const char *, ...)); + register int (*pr) __P((const char *, ...)); char partname[2]; char *sname; int sn; diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index c718a65..7968bb0 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.34 1996/03/25 17:06:34 jkh Exp $ + * $Id: subr_prf.c,v 1.35 1996/05/02 09:34:45 phk Exp $ */ #include "opt_ddb.h" @@ -267,15 +267,16 @@ logpri(level) msglogchar('>', NULL); } -void +int addlog(const char *fmt, ...) { register int s; va_list ap; + int retval; s = splhigh(); va_start(ap, fmt); - kvprintf(fmt, msglogchar, NULL, 10, ap); + retval = kvprintf(fmt, msglogchar, NULL, 10, ap); splx(s); va_end(ap); if (!log_open) { @@ -287,6 +288,7 @@ addlog(const char *fmt, ...) va_end(ap); } logwakeup(); + return (retval); } int diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c index 125e81b..674f5c5 100644 --- a/sys/kern/uipc_proto.c +++ b/sys/kern/uipc_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_proto.c,v 1.5 1995/12/02 18:58:55 bde Exp $ + * $Id: uipc_proto.c,v 1.6 1995/12/14 08:32:08 phk Exp $ */ #include <sys/param.h> @@ -59,7 +59,7 @@ static struct protosw localsw[] = { 0, 0, 0, 0, }, { 0, 0, 0, 0, - raw_input, 0, raw_ctlinput, 0, + 0, 0, raw_ctlinput, 0, raw_usrreq, raw_init, 0, 0, 0, } diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 665ec53..b6b3e3b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.5 (Berkeley) 11/2/94 - * $Id: rtsock.c,v 1.17 1995/11/16 19:00:11 phk Exp $ + * $Id: rtsock.c,v 1.18 1996/03/11 15:13:07 davidg Exp $ */ #include <sys/param.h> @@ -782,7 +782,7 @@ extern struct domain routedomain; /* or at least forward */ static struct protosw routesw[] = { { SOCK_RAW, &routedomain, 0, PR_ATOMIC|PR_ADDR, - raw_input, route_output, raw_ctlinput, 0, + 0, route_output, raw_ctlinput, 0, route_usrreq, raw_init } diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index 903a9f3..2dee52a 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -11,7 +11,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.34 1996/04/03 13:52:13 phk Exp $ + * $Id: ip_fw.c,v 1.35 1996/05/06 20:31:04 phk Exp $ */ /* @@ -73,6 +73,11 @@ static void ipfw_report __P((char *txt, int rule, struct ip *ip)); static ip_fw_chk_t *old_chk_ptr; static ip_fw_ctl_t *old_ctl_ptr; +static int ip_fw_chk __P((struct ip **pip, int hlen, struct ifnet *rif, + int dir, struct mbuf **m)); +static int ip_fw_ctl __P((int stage, struct mbuf **mm)); + + /* * Returns 1 if the port is matched by the vector, 0 otherwise */ @@ -228,7 +233,7 @@ ipfw_report(char *txt, int rule, struct ip *ip) * Returns 1 if it should be accepted, 0 otherwise. */ -int +static int ip_fw_chk(pip, hlen, rif, dir, m) struct ip **pip; struct ifnet *rif; @@ -570,7 +575,7 @@ check_ipfw_struct(m) return frwl; } -int +static int ip_fw_ctl(stage, mm) int stage; struct mbuf **mm; diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 191ffa6..fe6e162 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.40 1996/04/03 13:52:16 phk Exp $ + * $Id: ip_input.c,v 1.41 1996/04/12 09:24:22 phk Exp $ */ #include <sys/param.h> @@ -61,6 +61,11 @@ #include <netinet/ip_icmp.h> #include <sys/socketvar.h> + +#ifdef IPFIREWALL +#include <netinet/ip_fw.h> +#endif + int rsvp_on = 0; static int ip_rsvp_on; struct socket *ip_rsvpd; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 07c7d3c8..dcf9018 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $Id: systm.h,v 1.37 1996/03/11 02:23:33 hsu Exp $ + * $Id: systm.h,v 1.38 1996/04/07 16:46:27 bde Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -117,7 +117,7 @@ void *phashinit __P((int count, int type, u_long *nentries)); __dead void panic __P((const char *, ...)) __dead2; __dead void boot __P((int)) __dead2; void tablefull __P((const char *)); -void addlog __P((const char *, ...)); +int addlog __P((const char *, ...)); int kvprintf __P((char const *, void (*)(int, void*), void *, int, va_list)); void log __P((int, const char *, ...)); int printf __P((const char *, ...)); diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index fa7e71d..7450088 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.22 1995/12/17 21:09:29 phk Exp $ + * $Id: ffs_alloc.c,v 1.23 1996/01/05 18:31:45 wollman Exp $ */ #include "opt_quota.h" @@ -57,7 +57,7 @@ extern u_long nextgennumber; -typedef long allocfcn_t __P((struct inode *ip, int cg, daddr_t bpref, +typedef daddr_t allocfcn_t __P((struct inode *ip, int cg, daddr_t bpref, int size)); static daddr_t ffs_alloccg __P((struct inode *, int, daddr_t, int)); diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index e02db04..7026b91 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.23 1996/04/19 19:34:19 bde Exp $ + * $Id: ufs_disksubr.c,v 1.24 1996/05/03 15:05:17 phk Exp $ */ #include <sys/param.h> @@ -370,7 +370,7 @@ diskerr(bp, dname, what, pri, blkdone, lp) int unit = dkunit(bp->b_dev); int slice = dkslice(bp->b_dev); int part = dkpart(bp->b_dev); - register void (*pr) __P((const char *, ...)); + register int (*pr) __P((const char *, ...)); char partname[2]; char *sname; int sn; |