[src/trunk]: src/sys Remove #else of #if STDC

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Remove #else of #if __STDC__
From: matt <matt%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 15:15:41 +0000
details:   https://anonhg.NetBSD.org/src/rev/251c2dcb5976
branches:  trunk
changeset: 566038:251c2dcb5976
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Apr 26 01:41:15 2004 +0000

description:
Remove #else of #if __STDC__

diffstat:

 sys/net/if_stf.c          |   9 ++-------
 sys/net/ppp_defs.h        |  10 +---------
 sys/net/raw_usrreq.c      |  10 ++--------
 sys/netccitt/hd_output.c  |  16 ++--------------
 sys/netccitt/llc_input.c  |  10 ++--------
 sys/netccitt/llc_output.c |  10 ++--------
 sys/netccitt/pk_input.c   |  10 ++--------
 sys/netccitt/pk_subr.c    |  12 ++----------
 sys/netipsec/key.c        |  13 ++-----------
 sys/netipsec/keysock.c    |  10 ++--------
 sys/netkey/key.c          |  13 ++-----------
 sys/netkey/keysock.c      |  10 ++--------
 12 files changed, 23 insertions(+), 110 deletions(-)

diffs (truncated from 397 to 300 lines):

diff -r 40f9a0530290 -r 251c2dcb5976 sys/net/if_stf.c
--- a/sys/net/if_stf.c  Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/net/if_stf.c  Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_stf.c,v 1.38 2004/04/22 01:01:40 matt Exp $ */
+/*     $NetBSD: if_stf.c,v 1.39 2004/04/26 01:41:15 matt Exp $ */
 /*     $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
 
 /*
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.38 2004/04/22 01:01:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.39 2004/04/26 01:41:15 matt Exp $");
 
 #include "opt_inet.h"
 
@@ -599,12 +599,7 @@
 }
 
 void
-#if __STDC__
 in_stf_input(struct mbuf *m, ...)
-#else
-in_stf_input(m, va_alist)
-       struct mbuf *m;
-#endif
 {
        int off, proto;
        struct stf_softc *sc;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/net/ppp_defs.h
--- a/sys/net/ppp_defs.h        Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/net/ppp_defs.h        Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppp_defs.h,v 1.8 2002/09/13 14:32:11 itojun Exp $      */
+/*     $NetBSD: ppp_defs.h,v 1.9 2004/04/26 01:41:15 matt Exp $        */
 /*     Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp    */
 
 /*
@@ -181,12 +181,4 @@
     time_t recv_idle;          /* time since last NP packet received */
 };
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
-#endif
-
 #endif /* _NET_PPP_DEFS_H_ */
diff -r 40f9a0530290 -r 251c2dcb5976 sys/net/raw_usrreq.c
--- a/sys/net/raw_usrreq.c      Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/net/raw_usrreq.c      Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_usrreq.c,v 1.21 2003/09/30 00:01:18 christos Exp $ */
+/*     $NetBSD: raw_usrreq.c,v 1.22 2004/04/26 01:41:15 matt Exp $     */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.21 2003/09/30 00:01:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.22 2004/04/26 01:41:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -70,13 +70,7 @@
  * Raw protocol interface.
  */
 void
-#if __STDC__
 raw_input(struct mbuf *m0, ...)
-#else
-raw_input(m0, va_alist)
-       struct mbuf *m0;
-       va_dcl
-#endif
 {
        struct rawcb *rp;
        struct mbuf *m = m0;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netccitt/hd_output.c
--- a/sys/netccitt/hd_output.c  Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netccitt/hd_output.c  Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd_output.c,v 1.15 2003/08/07 16:33:00 agc Exp $       */
+/*     $NetBSD: hd_output.c,v 1.16 2004/04/26 01:41:15 matt Exp $      */
 
 /*
  * Copyright (c) 1990, 1993
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd_output.c,v 1.15 2003/08/07 16:33:00 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd_output.c,v 1.16 2004/04/26 01:41:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,13 +105,7 @@
  */
 
 int
-#if __STDC__
 hd_output(struct mbuf *m0, ...)
-#else
-hd_output(m0, va_alist)
-       struct mbuf    *m0;
-       va_dcl
-#endif
 {
        struct hdcb *hdp;
        struct mbuf *m = m0;
@@ -246,13 +240,7 @@
 }
 
 int
-#if __STDC__
 hd_ifoutput(struct mbuf *m, ...)
-#else
-hd_ifoutput(m, va_alist)
-       struct mbuf *m;
-       va_dcl
-#endif
 {
        struct hdcb *hdp;
        struct ifnet *ifp;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netccitt/llc_input.c
--- a/sys/netccitt/llc_input.c  Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netccitt/llc_input.c  Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: llc_input.c,v 1.12 2003/08/07 16:33:01 agc Exp $       */
+/*     $NetBSD: llc_input.c,v 1.13 2004/04/26 01:41:15 matt Exp $      */
 
 /* 
  * Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: llc_input.c,v 1.12 2003/08/07 16:33:01 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: llc_input.c,v 1.13 2004/04/26 01:41:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -344,13 +344,7 @@
  *                 are then enacted accordingly.
  */
 int
-#if __STDC__
 llc_input(struct mbuf *m, ...)
-#else
-llc_input(m, va_alist)
-       struct mbuf *m;
-       va_dcl
-#endif
 {
        int frame_kind;
        int pollfinal;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netccitt/llc_output.c
--- a/sys/netccitt/llc_output.c Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netccitt/llc_output.c Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: llc_output.c,v 1.10 2003/08/07 16:33:02 agc Exp $      */
+/*     $NetBSD: llc_output.c,v 1.11 2004/04/26 01:41:15 matt Exp $     */
 
 /* 
  * Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: llc_output.c,v 1.10 2003/08/07 16:33:02 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: llc_output.c,v 1.11 2004/04/26 01:41:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,13 +105,7 @@
  */
 
 int
-#if __STDC__
 llc_output(struct mbuf *m, ...)
-#else
-llc_output(m, va_alist)
-       struct mbuf *m;
-       va_dcl
-#endif
 {
        struct llc_linkcb *linkp;
        int    i = splnet();
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netccitt/pk_input.c
--- a/sys/netccitt/pk_input.c   Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netccitt/pk_input.c   Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pk_input.c,v 1.23 2004/04/22 01:01:40 matt Exp $       */
+/*     $NetBSD: pk_input.c,v 1.24 2004/04/26 01:41:15 matt Exp $       */
 
 /*
  * Copyright (c) 1991, 1992, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pk_input.c,v 1.23 2004/04/22 01:01:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pk_input.c,v 1.24 2004/04/26 01:41:15 matt Exp $");
 
 #include "opt_hdlc.h"
 #include "opt_llc.h"
@@ -393,13 +393,7 @@
         ((xp)->packet_cause >= X25_RESTART_DTE_ORIGINATED2))
 
 void
-#if __STDC__
 pk_input(struct mbuf *m, ...)
-#else
-pk_input(m, va_alist)
-       struct mbuf *m;
-       va_dcl
-#endif
 {
        struct x25_packet *xp;
        struct pklcd *lcp;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netccitt/pk_subr.c
--- a/sys/netccitt/pk_subr.c    Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netccitt/pk_subr.c    Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pk_subr.c,v 1.27 2004/04/21 18:40:41 itojun Exp $      */
+/*     $NetBSD: pk_subr.c,v 1.28 2004/04/26 01:41:15 matt Exp $        */
 
 /*
  * Copyright (c) 1991, 1992, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pk_subr.c,v 1.27 2004/04/21 18:40:41 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pk_subr.c,v 1.28 2004/04/26 01:41:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1167,15 +1167,7 @@
 
 /* VARARGS1 */
 void
-#if __STDC__
 pk_message(int lcn, struct x25config * xcp, char * fmt,...)
-#else
-pk_message(lcn, xcp, fmt, va_alist)
-       int             lcn;
-       struct x25config *xcp;
-       char           *fmt;
-       va_dcl
-#endif
 {
        va_list         ap;
 
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netipsec/key.c
--- a/sys/netipsec/key.c        Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netipsec/key.c        Mon Apr 26 01:41:15 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.12 2004/04/25 22:25:03 jonathan Exp $        */
+/*     $NetBSD: key.c,v 1.13 2004/04/26 01:41:15 matt Exp $    */
 /*     $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $        */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.12 2004/04/25 22:25:03 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.13 2004/04/26 01:41:15 matt Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -1598,17 +1598,8 @@
 
 /* m will not be freed nor modified */
 static struct mbuf *
-#ifdef __STDC__
 key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp,
        int ndeep, int nitem, ...)
-#else
-key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
-       struct mbuf *m;
-       const struct sadb_msghdr *mhp;
-       int ndeep;
-       int nitem;
-       va_dcl
-#endif
 {
        va_list ap;
        int idx;
diff -r 40f9a0530290 -r 251c2dcb5976 sys/netipsec/keysock.c
--- a/sys/netipsec/keysock.c    Mon Apr 26 01:40:40 2004 +0000
+++ b/sys/netipsec/keysock.c    Mon Apr 26 01:41:15 2004 +0000
Prev by Date: [src/trunk]: src/usr.bin/gzip - properly parse --fast/--best/-1..-9 again. n...
Next by Date: [src/trunk]: src/sys/sys Un-__P().
Previous by Thread: [src/trunk]: src/usr.bin/gzip - properly parse --fast/--best/-1..-9 again. n...
Next by Thread: [src/trunk]: src/sys/sys Un-__P().
Indexes:
Home | Main Index | Thread Index | Old Index
[src/trunk]: src/sys Remove #else of #if __STDC__

[src/trunk]: src/sys Remove #else of #if STDC
