trailing comment after #else or #endif

SCCS-vsn: sys/stand.att/stat.c 7.4
SCCS-vsn: sys/netns/idp_usrreq.c 7.13
SCCS-vsn: sys/netns/spp_usrreq.c 7.17
SCCS-vsn: sys/netiso/argo_debug.h 7.5
SCCS-vsn: sys/netiso/clnp.h 7.10
SCCS-vsn: sys/netiso/clnp_debug.c 7.11
SCCS-vsn: sys/netiso/clnp_input.c 7.16
SCCS-vsn: sys/netiso/clnp_raw.c 7.11
SCCS-vsn: sys/netiso/clnp_stat.h 7.5
SCCS-vsn: sys/netiso/cons_pcb.h 7.5
SCCS-vsn: sys/netiso/esis.h 7.5
SCCS-vsn: sys/netiso/if_cons.c 7.13
SCCS-vsn: sys/netiso/iso.c 7.23
SCCS-vsn: sys/netiso/iso.h 7.9
SCCS-vsn: sys/netiso/iso_chksum.c 7.9
SCCS-vsn: sys/netiso/iso_errno.h 7.6
SCCS-vsn: sys/netiso/iso_pcb.c 7.14
SCCS-vsn: sys/netiso/iso_var.h 7.6
SCCS-vsn: sys/netiso/tp_clnp.h 7.5
SCCS-vsn: sys/netiso/tp_cons.c 7.12
SCCS-vsn: sys/netiso/tp_emit.c 7.17
SCCS-vsn: sys/netiso/tp_inet.c 7.12
SCCS-vsn: sys/netiso/tp_input.c 7.32
SCCS-vsn: sys/netiso/tp_ip.h 7.5
SCCS-vsn: sys/netiso/tp_iso.c 7.16
SCCS-vsn: sys/netiso/tp_meas.c 7.6
SCCS-vsn: sys/netiso/tp_meas.h 7.6
SCCS-vsn: sys/netiso/tp_output.c 7.18
SCCS-vsn: sys/netiso/tp_param.h 7.13
SCCS-vsn: sys/netiso/tp_pcb.c 7.26
SCCS-vsn: sys/netiso/tp_pcb.h 7.25
SCCS-vsn: sys/netiso/tp_seq.h 7.6
SCCS-vsn: sys/netiso/tp_stat.h 7.8
SCCS-vsn: sys/netiso/tp_subr.c 7.21
SCCS-vsn: sys/netiso/tp_subr2.c 7.22
SCCS-vsn: sys/netiso/tp_timer.h 7.8
SCCS-vsn: sys/netiso/tp_tpdu.h 7.5
SCCS-vsn: sys/netiso/tp_trace.c 7.6
SCCS-vsn: sys/netiso/tp_trace.h 7.8
SCCS-vsn: sys/netiso/tp_user.h 7.14
SCCS-vsn: sys/netiso/tp_usrreq.c 7.28

diff --git a/usr/src/sys/netiso/argo_debug.h b/usr/src/sys/netiso/argo_debug.h
index d08f0d6..22d5f7e 100644 (file)
--- a/usr/src/sys/netiso/argo_debug.h
+++ b/usr/src/sys/netiso/argo_debug.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)argo_debug.h        7.4 (Berkeley) %G%
+ *     @(#)argo_debug.h        7.5 (Berkeley) %G%

  */
 
 /*****************************************************************
  */
 
 /*****************************************************************


@@ -51,14 +51,14 @@ SOFTWARE.
  * lint can't handle the flaky vacuous definitions 
  * of IFDEBUG, ENDDEBUG, etc.
  */
  * lint can't handle the flaky vacuous definitions 
  * of IFDEBUG, ENDDEBUG, etc.
  */

-#endif defined(lint)
+#endif /* defined(lint) */

 
 /***********************************************
  * DEBUG ON:
  **********************************************/
 #ifndef ARGO_DEBUG
 #define ARGO_DEBUG
 
 /***********************************************
  * DEBUG ON:
  **********************************************/
 #ifndef ARGO_DEBUG
 #define ARGO_DEBUG

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 
 #ifdef ARGO_DEBUG
 
 
 #ifdef ARGO_DEBUG


@@ -78,7 +78,7 @@ unsigned char argo_debug[128];
        if(argo_debug[ascii]) { 
 #define ENDDEBUG  ; }
 
        if(argo_debug[ascii]) { 
 #define ENDDEBUG  ; }
 

-#else  ARGO_DEBUG
+#else  /* ARGO_DEBUG */

 
 /***********************************************
  * DEBUG OFF:
 
 /***********************************************
  * DEBUG OFF:


@@ -86,11 +86,11 @@ unsigned char       argo_debug[128];
 
 #ifndef STAR
 #define STAR *
 
 #ifndef STAR
 #define STAR *

-#endif STAR
+#endif /* STAR */

 #define IFDEBUG(ascii)  //*beginning of comment*/STAR
 #define ENDDEBUG        STAR/*end of comment*//
 
 #define IFDEBUG(ascii)  //*beginning of comment*/STAR
 #define ENDDEBUG        STAR/*end of comment*//
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 /***********************************************
  * ASSERT 
 
 /***********************************************
  * ASSERT 


@@ -100,15 +100,15 @@ unsigned char     argo_debug[128];
 #ifndef lint
 #define ASSERT(phrase) \
 if( !(phrase) ) printf("ASSERTION NOT VALID at line %d file %s\n",__LINE__,__FILE__)
 #ifndef lint
 #define ASSERT(phrase) \
 if( !(phrase) ) printf("ASSERTION NOT VALID at line %d file %s\n",__LINE__,__FILE__)

-#else lint
+#else /* lint */

 #define ASSERT(phrase) /* phrase */
 #define ASSERT(phrase) /* phrase */

-#endif lint
+#endif /* lint */

 
 

-#else ARGO_DEBUG
+#else /* ARGO_DEBUG */

 
 #define ASSERT(phrase) /* phrase */
 
 
 #define ASSERT(phrase) /* phrase */
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 
 /***********************************************
 
 
 /***********************************************


@@ -252,7 +252,7 @@ void dump_mbuf();
 #define        TPMT_PCB        0x23
 #define        TPMT_PERF       0x45
 
 #define        TPMT_PCB        0x23
 #define        TPMT_PERF       0x45
 

-#else ARGO_DEBUG
+#else /* ARGO_DEBUG */

 
 #define        TPMT_DATA       MT_DATA
 #define        TPMT_RCVRTC     MT_DATA
 
 #define        TPMT_DATA       MT_DATA
 #define        TPMT_RCVRTC     MT_DATA


@@ -265,6 +265,6 @@ void dump_mbuf();
 #define        TPMT_PCB        MT_PCB
 #define        TPMT_PERF       MT_PCB
 
 #define        TPMT_PCB        MT_PCB
 #define        TPMT_PERF       MT_PCB
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 

-#endif __ARGO_DEBUG__
+#endif /* __ARGO_DEBUG__ */

diff --git a/usr/src/sys/netiso/clnp.h b/usr/src/sys/netiso/clnp.h
index 3c1ebbb..59bf76d 100644 (file)
--- a/usr/src/sys/netiso/clnp.h
+++ b/usr/src/sys/netiso/clnp.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)clnp.h      7.9 (Berkeley) %G%
+ *     @(#)clnp.h      7.10 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -50,7 +50,7 @@ SOFTWARE.
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

 
 /* should be config option but cpp breaks with too many #defines */
 #define        DECBIT
 
 /* should be config option but cpp breaks with too many #defines */
 #define        DECBIT


@@ -390,7 +390,7 @@ extern float troll_random;
 #define        SN_MTU(ifp, rt) (((rt && rt->rt_rmx.rmx_mtu) ?\
        rt->rt_rmx.rmx_mtu : clnp_badmtu(ifp, rt, __LINE__, __FILE__)))
 
 #define        SN_MTU(ifp, rt) (((rt && rt->rt_rmx.rmx_mtu) ?\
        rt->rt_rmx.rmx_mtu : clnp_badmtu(ifp, rt, __LINE__, __FILE__)))
 

-#endif TROLL
+#endif /* TROLL */

 
 /*
  *     Macro to remove an address from a clnp header
 
 /*
  *     Macro to remove an address from a clnp header


@@ -449,5 +449,5 @@ struct iso_addr     *clnp_srcaddr();
 struct mbuf            *clnp_reass();
 #ifdef TROLL
 struct troll   trollctl;
 struct mbuf            *clnp_reass();
 #ifdef TROLL
 struct troll   trollctl;

-#endif TROLL
-#endif KERNEL
+#endif /* TROLL */
+#endif /* KERNEL */

diff --git a/usr/src/sys/netiso/clnp_debug.c b/usr/src/sys/netiso/clnp_debug.c
index 1dd56f6..fa9433a 100644 (file)
--- a/usr/src/sys/netiso/clnp_debug.c
+++ b/usr/src/sys/netiso/clnp_debug.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)clnp_debug.c        7.10 (Berkeley) %G%
+ *     @(#)clnp_debug.c        7.11 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -64,7 +64,7 @@ struct addr_osinet u_osinet = {
        {0x00, 0x04},
        {0x00, 0x02, 0x00, 0x01, 0x23, 0x42, 0x78, 0x20, 0x01, 0x05, 0x00}
 };
        {0x00, 0x04},
        {0x00, 0x02, 0x00, 0x01, 0x23, 0x42, 0x78, 0x20, 0x01, 0x05, 0x00}
 };

-#endif notdef
+#endif /* notdef */

 struct addr_rfc986 u_rfc986 = {
        {0x00, 0x06},
        {0x01, 0xc0, 0x0c, 0x0c, 0xab, 0x11}
 struct addr_rfc986 u_rfc986 = {
        {0x00, 0x06},
        {0x01, 0xc0, 0x0c, 0x0c, 0xab, 0x11}


@@ -103,7 +103,7 @@ main()
        a.isoa_len = 9;
        printf("type bad idi: %s\n", clnp_iso_addrp(&a));
 }
        a.isoa_len = 9;
        printf("type bad idi: %s\n", clnp_iso_addrp(&a));
 }

-#endif TESTDEBUG
+#endif /* TESTDEBUG */

 
 unsigned int   clnp_debug;
 static char letters[] = "0123456789abcdef";
 
 unsigned int   clnp_debug;
 static char letters[] = "0123456789abcdef";


@@ -202,7 +202,7 @@ struct iso_addr *isoa;
                                cp = clnp_hexp(&o986->o986_inetaddr[3], 1, cp);
                                *cp++ = DELIM;
                                cp = clnp_hexp(&o986->o986_upid, 1, cp);
                                cp = clnp_hexp(&o986->o986_inetaddr[3], 1, cp);
                                *cp++ = DELIM;
                                cp = clnp_hexp(&o986->o986_upid, 1, cp);

-#endif vax
+#endif /* vax */

                        }
                        
                } break;
                        }
                        
                } break;


@@ -211,7 +211,7 @@ struct iso_addr *isoa;
                        *cp++ = '?';
                        break;
        }
                        *cp++ = '?';
                        break;
        }

-#endif notdef
+#endif /* notdef */

        *cp = (char)0;
        
        return(iso_addr_b);
        *cp = (char)0;
        
        return(iso_addr_b);


@@ -231,4 +231,4 @@ register struct sockaddr_iso *s;
        return (iso_addr_b);
 }
 
        return (iso_addr_b);
 }
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

diff --git a/usr/src/sys/netiso/clnp_input.c b/usr/src/sys/netiso/clnp_input.c
index 2eaa4cf..cc0d3f9 100644 (file)
--- a/usr/src/sys/netiso/clnp_input.c
+++ b/usr/src/sys/netiso/clnp_input.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)clnp_input.c        7.15 (Berkeley) %G%
+ *     @(#)clnp_input.c        7.16 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -74,7 +74,7 @@ int   esis_input();
 
 #ifdef ISO_X25ESIS
 int    x25esis_input();
 
 #ifdef ISO_X25ESIS
 int    x25esis_input();

-#endif ISO_X25ESIS
+#endif /* ISO_X25ESIS */

 
 /*
  * FUNCTION:           clnp_init
 
 /*
  * FUNCTION:           clnp_init


@@ -410,7 +410,7 @@ struct snpa_hdr     *shp;   /* subnetwork header */
                        if (need_afrin)
                                INCSTAT(cns_congest_rcvd);
                }
                        if (need_afrin)
                                INCSTAT(cns_congest_rcvd);
                }

-#endif DECBIT
+#endif /* DECBIT */

 
                if (errcode != 0) {
                        clnp_discard(m, (char)errcode);
 
                if (errcode != 0) {
                        clnp_discard(m, (char)errcode);


@@ -522,4 +522,4 @@ struct snpa_hdr     *shp;   /* subnetwork header */
                break;
        }
 }
                break;
        }
 }

-#endif ISO
+#endif /* ISO */

diff --git a/usr/src/sys/netiso/clnp_raw.c b/usr/src/sys/netiso/clnp_raw.c
index cd7ac46..0006eb9 100644 (file)
--- a/usr/src/sys/netiso/clnp_raw.c
+++ b/usr/src/sys/netiso/clnp_raw.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)clnp_raw.c  7.10 (Berkeley) %G%
+ *     @(#)clnp_raw.c  7.11 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -83,7 +83,7 @@ int                                   hdrlen; /* length (in bytes) of clnp header */
                m_freem(m);
                return;
        }
                m_freem(m);
                return;
        }

-#endif TROLL
+#endif /* TROLL */

 
        if (raw_input(m, &rclnp_proto, (struct sockaddr *)src,
                (struct sockaddr *)dst) == 0) {
 
        if (raw_input(m, &rclnp_proto, (struct sockaddr *)src,
                (struct sockaddr *)dst) == 0) {


@@ -184,7 +184,7 @@ struct mbuf         **m;                    /* ptr to ptr to option data */
        else switch (op) {
 #else
        switch (op) {
        else switch (op) {
 #else
        switch (op) {

-#endif SOL_NETWORK
+#endif /* SOL_NETWORK */

                case PRCO_SETOPT:
                        switch (optname) {
                                case CLNPOPT_FLAGS: {
                case PRCO_SETOPT:
                        switch (optname) {
                                case CLNPOPT_FLAGS: {


@@ -230,7 +230,7 @@ struct mbuf         **m;                    /* ptr to ptr to option data */
                                        error = EINVAL;
                                        break;
                        }
                                        error = EINVAL;
                                        break;
                        }

-#endif notdef
+#endif /* notdef */

                        break;
                default:
                        error = EINVAL;
                        break;
                default:
                        error = EINVAL;

diff --git a/usr/src/sys/netiso/clnp_stat.h b/usr/src/sys/netiso/clnp_stat.h
index 6163273..34ab67c 100644 (file)
--- a/usr/src/sys/netiso/clnp_stat.h
+++ b/usr/src/sys/netiso/clnp_stat.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)clnp_stat.h 7.4 (Berkeley) %G%
+ *     @(#)clnp_stat.h 7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -71,7 +71,7 @@ struct clnp_stat {
 
 #ifdef INCSTAT
 #undef INCSTAT
 
 #ifdef INCSTAT
 #undef INCSTAT

-#endif INCSTAT
+#endif /* INCSTAT */

 #define INCSTAT(x) clnp_stat./**/x/**/++
 
 #define INCSTAT(x) clnp_stat./**/x/**/++
 

-#endif __CLNP_STAT__
+#endif /* __CLNP_STAT__ */

diff --git a/usr/src/sys/netiso/cons_pcb.h b/usr/src/sys/netiso/cons_pcb.h
index 3ee526f..1a094cc 100644 (file)
--- a/usr/src/sys/netiso/cons_pcb.h
+++ b/usr/src/sys/netiso/cons_pcb.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cons_pcb.h  7.4 (Berkeley) %G%
+ *     @(#)cons_pcb.h  7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -52,9 +52,9 @@ SOFTWARE.
 
 #ifndef ARGO_DEBUG
 #define X25_TTL 600 /* 5 min */
 
 #ifndef ARGO_DEBUG
 #define X25_TTL 600 /* 5 min */

-#else ARGO_DEBUG
+#else /* ARGO_DEBUG */

 #define X25_TTL 120 /* 1 min */
 #define X25_TTL 120 /* 1 min */

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 struct cons_pcb {
        struct isopcb   _co_isopcb;
 
 struct cons_pcb {
        struct isopcb   _co_isopcb;


@@ -164,4 +164,4 @@ struct e_clear_data                                 {
 
 #ifdef KERNEL
 #define IncStat(XYZ) cons_stat.XYZ++
 
 #ifdef KERNEL
 #define IncStat(XYZ) cons_stat.XYZ++

-#endif KERNEL
+#endif /* KERNEL */

diff --git a/usr/src/sys/netiso/esis.h b/usr/src/sys/netiso/esis.h
index d8bb79f..48d5262 100644 (file)
--- a/usr/src/sys/netiso/esis.h
+++ b/usr/src/sys/netiso/esis.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)esis.h      7.4 (Berkeley) %G%
+ *     @(#)esis.h      7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -52,7 +52,7 @@ SOFTWARE.
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

 
 #define        SNPAC_AGE               60                      /* seconds */
 #define        ESIS_CONFIG             60                      /* seconds */
 
 #define        SNPAC_AGE               60                      /* seconds */
 #define        ESIS_CONFIG             60                      /* seconds */


@@ -106,4 +106,4 @@ struct esis_stat {
 
 #ifdef KERNEL
 struct esis_stat esis_stat;
 
 #ifdef KERNEL
 struct esis_stat esis_stat;

-#endif KERNEL
+#endif /* KERNEL */

diff --git a/usr/src/sys/netiso/if_cons.c b/usr/src/sys/netiso/if_cons.c
index ff8fe27..9ae1e6d 100644 (file)
--- a/usr/src/sys/netiso/if_cons.c
+++ b/usr/src/sys/netiso/if_cons.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if_cons.c   7.12 (Berkeley) %G%
+ *     @(#)if_cons.c   7.13 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -47,9 +47,9 @@ SOFTWARE.
 #ifdef ARGO_DEBUG
 #define Static  
 unsigned LAST_CALL_PCB;
 #ifdef ARGO_DEBUG
 #define Static  
 unsigned LAST_CALL_PCB;

-#else ARGO_DEBUG
+#else /* ARGO_DEBUG */

 #define Static static
 #define Static static

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 #ifndef SOCK_STREAM
 #include <sys/param.h>
 
 #ifndef SOCK_STREAM
 #include <sys/param.h>


@@ -90,7 +90,7 @@ unsigned LAST_CALL_PCB;
 #define MT_XCONFIRM    MT_DATA
 #define MT_XDATA       MT_DATA
 #define MT_XHEADER     MT_HEADER
 #define MT_XCONFIRM    MT_DATA
 #define MT_XDATA       MT_DATA
 #define MT_XHEADER     MT_HEADER

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 #define DONTCLEAR       -1
 
 
 #define DONTCLEAR       -1
 


@@ -141,7 +141,7 @@ Static      int                             issue_clear_req();
 
 #ifndef        PHASEONE
 extern struct ifaddr   *ifa_ifwithnet();
 
 #ifndef        PHASEONE
 extern struct ifaddr   *ifa_ifwithnet();

-#endif PHASEONE
+#endif /* PHASEONE */

 
 extern struct ifaddr   *ifa_ifwithaddr();
 
 
 extern struct ifaddr   *ifa_ifwithaddr();
 


@@ -487,7 +487,7 @@ done:
 
 
 
 
 
 

-#endif KERNEL
+#endif /* KERNEL */

 
 /*
  * NAME:       make_partial_x25_packet()
 
 /*
  * NAME:       make_partial_x25_packet()


@@ -516,9 +516,9 @@ done:
 
 #ifdef X25_1984 
 int cons_use_facils = 1;
 
 #ifdef X25_1984 
 int cons_use_facils = 1;

-#else X25_1984 
+#else /* X25_1984  */

 int cons_use_facils = 0;
 int cons_use_facils = 0;

-#endif X25_1984 
+#endif /* X25_1984  */

 
 int cons_use_udata = 1; /* KLUDGE FOR DEBUGGING */
 
 
 int cons_use_udata = 1; /* KLUDGE FOR DEBUGGING */
 


@@ -931,4 +931,4 @@ parse_facil(lcp, isop, buf, buf_len)
        return 0;
 }
 
        return 0;
 }
 

-#endif TPCONS
+#endif /* TPCONS */

diff --git a/usr/src/sys/netiso/iso.c b/usr/src/sys/netiso/iso.c
index 7bac688..70a243a 100644 (file)
--- a/usr/src/sys/netiso/iso.c
+++ b/usr/src/sys/netiso/iso.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso.c       7.22 (Berkeley) %G%
+ *     @(#)iso.c       7.23 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -183,7 +183,7 @@ struct sockaddr_iso *sisoa, *sisob;
 
        return ((lena == lenb) && (!bcmp(bufa, bufb, lena)));
 }
 
        return ((lena == lenb) && (!bcmp(bufa, bufb, lena)));
 }

-#endif notdef
+#endif /* notdef */

 
 /*
  * FUNCTION:           iso_hashchar
 
 /*
  * FUNCTION:           iso_hashchar


@@ -380,7 +380,7 @@ caddr_t                     buf;            /* RESULT: network portion of address here */
        ENDDEBUG
        return len;
 }
        ENDDEBUG
        return len;
 }

-#endif notdef
+#endif /* notdef */

 /*
  * Generic iso control operations (ioctl's).
  * Ifp is 0 if not an interface-specific ioctl.
 /*
  * Generic iso control operations (ioctl's).
  * Ifp is 0 if not an interface-specific ioctl.


@@ -682,7 +682,7 @@ iso_ifwithidi(addr)
        return ((struct ifaddr *)0);
 }
 
        return ((struct ifaddr *)0);
 }
 

-#endif notdef
+#endif /* notdef */

 /*
  * FUNCTION:           iso_ck_addr
  *
 /*
  * FUNCTION:           iso_ck_addr
  *


@@ -731,7 +731,7 @@ struct iso_addr     *isoab;         /* other addr to check */
        }
        return(0);
 }
        }
        return(0);
 }

-#endif notdef
+#endif /* notdef */

 /*
  * FUNCTION:           iso_localifa()
  *
 /*
  * FUNCTION:           iso_localifa()
  *


@@ -787,7 +787,7 @@ iso_localifa(siso)
 
 #ifdef TPCONS
 #include <netiso/cons.h>
 
 #ifdef TPCONS
 #include <netiso/cons.h>

-#endif TPCONS
+#endif /* TPCONS */

 /*
  * FUNCTION:           iso_nlctloutput
  *
 /*
  * FUNCTION:           iso_nlctloutput
  *


@@ -848,7 +848,7 @@ struct mbuf *m;                     /* data for set, buffer for get */
                        bcopy(data, (caddr_t)isop->isop_x25crud, (unsigned)data_len);
                        isop->isop_x25crud_len = data_len;
                        break;
                        bcopy(data, (caddr_t)isop->isop_x25crud, (unsigned)data_len);
                        isop->isop_x25crud_len = data_len;
                        break;

-#endif TPCONS
+#endif /* TPCONS */

 
                default:
                        error = EOPNOTSUPP;
 
                default:
                        error = EOPNOTSUPP;


@@ -857,7 +857,7 @@ struct mbuf *m;                     /* data for set, buffer for get */
                m_freem(m);
        return error;
 }
                m_freem(m);
        return error;
 }

-#endif ISO
+#endif /* ISO */

 
 #ifdef ARGO_DEBUG
 
 
 #ifdef ARGO_DEBUG
 


@@ -891,4 +891,4 @@ dump_isoaddr(s)
        }
 }
 
        }
 }
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

diff --git a/usr/src/sys/netiso/iso.h b/usr/src/sys/netiso/iso.h
index 6c42791..32e8849 100644 (file)
--- a/usr/src/sys/netiso/iso.h
+++ b/usr/src/sys/netiso/iso.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso.h       7.8 (Berkeley) %G%
+ *     @(#)iso.h       7.9 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -104,7 +104,7 @@ SOFTWARE.
 
 #ifndef IN_CLASSA_NET
 #include <netinet/in.h>
 
 #ifndef IN_CLASSA_NET
 #include <netinet/in.h>

-#endif IN_CLASSA_NET
+#endif /* IN_CLASSA_NET */

 
 
 
 
 
 


@@ -166,4 +166,4 @@ __END_DECLS
 #endif /* KERNEL */
 
 #define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
 #endif /* KERNEL */
 
 #define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))

-#endif __ISO__
+#endif /* __ISO__ */

diff --git a/usr/src/sys/netiso/iso_chksum.c b/usr/src/sys/netiso/iso_chksum.c
index 95a1fe4..8f90b3f 100644 (file)
--- a/usr/src/sys/netiso/iso_chksum.c
+++ b/usr/src/sys/netiso/iso_chksum.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso_chksum.c        7.8 (Berkeley) %G%
+ *     @(#)iso_chksum.c        7.9 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -61,11 +61,11 @@ SOFTWARE.
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#endif ISO
+#endif /* ISO */

 
 #ifndef MNULL
 #define MNULL (struct mbuf *)0
 
 #ifndef MNULL
 #define MNULL (struct mbuf *)0

-#endif MNULL
+#endif /* MNULL */

 
 /*
  * FUNCTION:   iso_check_csum
 
 /*
  * FUNCTION:   iso_check_csum

diff --git a/usr/src/sys/netiso/iso_errno.h b/usr/src/sys/netiso/iso_errno.h
index 6d585b4..de81075 100644 (file)
--- a/usr/src/sys/netiso/iso_errno.h
+++ b/usr/src/sys/netiso/iso_errno.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso_errno.h 7.5 (Berkeley) %G%
+ *     @(#)iso_errno.h 7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -245,4 +245,4 @@ SOFTWARE.
 
 #define CONL_ERROR_MAX 0x1c3
 
 
 #define CONL_ERROR_MAX 0x1c3
 

-#endif __ISO_ERRNO__
+#endif /* __ISO_ERRNO__ */

diff --git a/usr/src/sys/netiso/iso_pcb.c b/usr/src/sys/netiso/iso_pcb.c
index 338d1ba..10b0122 100644 (file)
--- a/usr/src/sys/netiso/iso_pcb.c
+++ b/usr/src/sys/netiso/iso_pcb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso_pcb.c   7.13 (Berkeley) %G%
+ *     @(#)iso_pcb.c   7.14 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -588,4 +588,4 @@ iso_pcblookup(head, fportlen, fport, laddr)
        }
        return (struct isopcb *)0;
 }
        }
        return (struct isopcb *)0;
 }

-#endif ISO
+#endif /* ISO */

diff --git a/usr/src/sys/netiso/iso_var.h b/usr/src/sys/netiso/iso_var.h
index 3f714ac..6773c31 100644 (file)
--- a/usr/src/sys/netiso/iso_var.h
+++ b/usr/src/sys/netiso/iso_var.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso_var.h   7.5 (Berkeley) %G%
+ *     @(#)iso_var.h   7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -108,4 +108,4 @@ struct snpa_hdr {
 struct iso_ifaddr      *iso_ifaddr;    /* linked list of iso address ifaces */
 struct iso_ifaddr      *iso_localifa();        /* linked list of iso address ifaces */
 struct ifqueue                 clnlintrq;              /* clnl packet input queue */
 struct iso_ifaddr      *iso_ifaddr;    /* linked list of iso address ifaces */
 struct iso_ifaddr      *iso_localifa();        /* linked list of iso address ifaces */
 struct ifqueue                 clnlintrq;              /* clnl packet input queue */

-#endif KERNEL
+#endif /* KERNEL */

diff --git a/usr/src/sys/netiso/tp_clnp.h b/usr/src/sys/netiso/tp_clnp.h
index c1e8957..4a6d835 100644 (file)
--- a/usr/src/sys/netiso/tp_clnp.h
+++ b/usr/src/sys/netiso/tp_clnp.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_clnp.h   7.4 (Berkeley) %G%
+ *     @(#)tp_clnp.h   7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -49,7 +49,7 @@ SOFTWARE.
 
 #ifndef SOCK_STREAM
 #include <sys/socket.h>
 
 #ifndef SOCK_STREAM
 #include <sys/socket.h>

-#endif SOCK_STREAM
+#endif /* SOCK_STREAM */

 
 #ifndef RTFREE
 #include <net/route.h>
 
 #ifndef RTFREE
 #include <net/route.h>


@@ -65,4 +65,4 @@ SOFTWARE.
 struct isopcb tp_isopcb;       
        /* queue of active inpcbs for tp ; for tp with dod ip */
 
 struct isopcb tp_isopcb;       
        /* queue of active inpcbs for tp ; for tp with dod ip */
 

-#endif __TP_CLNP__
+#endif /* __TP_CLNP__ */

diff --git a/usr/src/sys/netiso/tp_cons.c b/usr/src/sys/netiso/tp_cons.c
index 9d53514..7818cb9 100644 (file)
--- a/usr/src/sys/netiso/tp_cons.c
+++ b/usr/src/sys/netiso/tp_cons.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_cons.c   7.11 (Berkeley) %G%
+ *     @(#)tp_cons.c   7.12 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -278,5 +278,5 @@ tpcons_dg_output(chan, m0, datalen)
 {
        return tpcons_output(((struct pklcd *)chan)->lcd_upnext, m0, datalen, 0);
 }
 {
        return tpcons_output(((struct pklcd *)chan)->lcd_upnext, m0, datalen, 0);
 }

-#endif TPCONS
-#endif ISO
+#endif /* TPCONS */
+#endif /* ISO */

diff --git a/usr/src/sys/netiso/tp_emit.c b/usr/src/sys/netiso/tp_emit.c
index e29d438..048dd62 100644 (file)
--- a/usr/src/sys/netiso/tp_emit.c
+++ b/usr/src/sys/netiso/tp_emit.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_emit.c   7.16 (Berkeley) %G%
+ *     @(#)tp_emit.c   7.17 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -362,7 +362,7 @@ tp_emit(dutype,     tpcb, seq, eot, data)
                                hdr->tpdu_seqeotX = htonl(seqeotX.s_seqeot);
 #else
                                hdr->tpdu_XAKseqX = seq;
                                hdr->tpdu_seqeotX = htonl(seqeotX.s_seqeot);
 #else
                                hdr->tpdu_XAKseqX = seq;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                hdr->tpdu_XAKseq = seq;
                        }
                        } else {
                                hdr->tpdu_XAKseq = seq;
                        }


@@ -383,7 +383,7 @@ tp_emit(dutype,     tpcb, seq, eot, data)
 #else
                                hdr->tpdu_XPDseqX = seq;
                                hdr->tpdu_XPDeotX = 1; /* always 1 for XPD tpdu */
 #else
                                hdr->tpdu_XPDseqX = seq;
                                hdr->tpdu_XPDeotX = 1; /* always 1 for XPD tpdu */

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                hdr->tpdu_XPDseq = seq;
                                hdr->tpdu_XPDeot = 1; /* always 1 for XPD tpdu */
                        } else {
                                hdr->tpdu_XPDseq = seq;
                                hdr->tpdu_XPDeot = 1; /* always 1 for XPD tpdu */


@@ -416,7 +416,7 @@ tp_emit(dutype,     tpcb, seq, eot, data)
 #else
                                hdr->tpdu_DTseqX = seq;
                                hdr->tpdu_DTeotX = eot;
 #else
                                hdr->tpdu_DTseqX = seq;
                                hdr->tpdu_DTeotX = eot;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else if (tpcb->tp_class == TP_CLASS_0) {
                                IFDEBUG(D_EMIT)
                                        printf("DT tpdu: class 0 m 0x%x hdr 0x%x\n", m, hdr);
                        } else if (tpcb->tp_class == TP_CLASS_0) {
                                IFDEBUG(D_EMIT)
                                        printf("DT tpdu: class 0 m 0x%x hdr 0x%x\n", m, hdr);


@@ -523,7 +523,7 @@ tp_emit(dutype,     tpcb, seq, eot, data)
                                hdr->tpdu_cdt = 0; 
                                hdr->tpdu_AKseqX = seq;
                                hdr->tpdu_AKcdtX = tpcb->tp_lcredit;
                                hdr->tpdu_cdt = 0; 
                                hdr->tpdu_AKseqX = seq;
                                hdr->tpdu_AKcdtX = tpcb->tp_lcredit;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                hdr->tpdu_AKseq = seq;
                                hdr->tpdu_AKcdt = tpcb->tp_lcredit;
                        } else {
                                hdr->tpdu_AKseq = seq;
                                hdr->tpdu_AKcdt = tpcb->tp_lcredit;

diff --git a/usr/src/sys/netiso/tp_inet.c b/usr/src/sys/netiso/tp_inet.c
index ecc1dba..6b45f81 100644 (file)
--- a/usr/src/sys/netiso/tp_inet.c
+++ b/usr/src/sys/netiso/tp_inet.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_inet.c   7.11 (Berkeley) %G%
+ *     @(#)tp_inet.c   7.12 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -658,5 +658,5 @@ dump_inaddr(addr)
 {
        printf("INET: port 0x%x; addr 0x%x\n", addr->sin_port, addr->sin_addr);
 }
 {
        printf("INET: port 0x%x; addr 0x%x\n", addr->sin_port, addr->sin_addr);
 }

-#endif ARGO_DEBUG
-#endif INET
+#endif /* ARGO_DEBUG */
+#endif /* INET */

diff --git a/usr/src/sys/netiso/tp_input.c b/usr/src/sys/netiso/tp_input.c
index 037191e..e74d2c7 100644 (file)
--- a/usr/src/sys/netiso/tp_input.c
+++ b/usr/src/sys/netiso/tp_input.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_input.c  7.31 (Berkeley) %G%
+ *     @(#)tp_input.c  7.32 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -359,7 +359,7 @@ tpcons_output()
 {
        return(0);
 }
 {
        return(0);
 }

-#endif !CONS
+#endif /* !CONS */

 
 /* 
  * NAME:       tp_input()
 
 /* 
  * NAME:       tp_input()


@@ -407,7 +407,7 @@ tp_input(m, faddr, laddr, cons_channel, dgout_routine, ce_bit)
        u_char                                  opt, dusize, addlopt, version;
 #ifdef TP_PERF_MEAS
        u_char                                  perf_meas;
        u_char                                  opt, dusize, addlopt, version;
 #ifdef TP_PERF_MEAS
        u_char                                  perf_meas;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

        u_char                                  fsufxlen, lsufxlen;
        caddr_t                                 fsufxloc, lsufxloc;
        int                                             tpdu_len;
        u_char                                  fsufxlen, lsufxlen;
        caddr_t                                 fsufxloc, lsufxloc;
        int                                             tpdu_len;


@@ -429,7 +429,7 @@ again:
        dusize = TP_DFL_TPDUSIZE;
 #ifdef TP_PERF_MEAS
        GET_CUR_TIME( &e.e_time ); perf_meas = 0;
        dusize = TP_DFL_TPDUSIZE;
 #ifdef TP_PERF_MEAS
        GET_CUR_TIME( &e.e_time ); perf_meas = 0;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

        
        IFDEBUG(D_TPINPUT)
                printf("tp_input(0x%x, ... 0x%x)\n", m, cons_channel);
        
        IFDEBUG(D_TPINPUT)
                printf("tp_input(0x%x, ... 0x%x)\n", m, cons_channel);


@@ -498,7 +498,7 @@ again:
                IncStat(ts_inv_dutype);
                goto discard;
        }
                IncStat(ts_inv_dutype);
                goto discard;
        }

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
        CHECK( (dutype < TP_MIN_TPDUTYPE || dutype > TP_MAX_TPDUTYPE),
                E_TP_INV_TPDU, ts_inv_dutype, respond, 
 
        CHECK( (dutype < TP_MIN_TPDUTYPE || dutype > TP_MAX_TPDUTYPE),
                E_TP_INV_TPDU, ts_inv_dutype, respond, 


@@ -580,7 +580,7 @@ again:
                        case    TPP_perf_meas:
                                vb_getval(P, u_char, perf_meas);
                                break;
                        case    TPP_perf_meas:
                                vb_getval(P, u_char, perf_meas);
                                break;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
                        case    TPP_vers:
                                /* not in class 0; 1 octet; in CR_TPDU only */
 
                        case    TPP_vers:
                                /* not in class 0; 1 octet; in CR_TPDU only */


@@ -744,7 +744,7 @@ again:
                        tpp.p_use_efc = (opt & TPO_USE_EFC) == TPO_USE_EFC;
                        tpp.p_use_nxpd = (addlopt & TPAO_USE_NXPD) == TPAO_USE_NXPD;
                        tpp.p_use_rcc = (addlopt & TPAO_USE_RCC) == TPAO_USE_RCC;
                        tpp.p_use_efc = (opt & TPO_USE_EFC) == TPO_USE_EFC;
                        tpp.p_use_nxpd = (addlopt & TPAO_USE_NXPD) == TPAO_USE_NXPD;
                        tpp.p_use_rcc = (addlopt & TPAO_USE_RCC) == TPAO_USE_RCC;

-#endif notdef
+#endif /* notdef */

 
                CHECK(
                        tp_consistency(tpcb, 0 /* not force or strict */, &tpp) != 0, 
 
                CHECK(
                        tp_consistency(tpcb, 0 /* not force or strict */, &tpp) != 0, 


@@ -832,7 +832,7 @@ again:
                                 */
                                (void) tp_setup_perf(tpcb);
                        }
                                 */
                                (void) tp_setup_perf(tpcb);
                        }

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

                        tpcb->tp_fref = sref;
 
                        /* We've already checked for consistency with the options 
                        tpcb->tp_fref = sref;
 
                        /* We've already checked for consistency with the options 


@@ -1048,7 +1048,7 @@ again:
                                 * to pass this info to the user anyway
                                 */
                                break;
                                 * to pass this info to the user anyway
                                 */
                                break;

-#endif notdef
+#endif /* notdef */

 
                        caseof( AK_TPDU_type, TPP_subseq ):
                                /* used after reduction of window */
 
                        caseof( AK_TPDU_type, TPP_subseq ):
                                /* used after reduction of window */


@@ -1116,7 +1116,7 @@ again:
                                tpp.p_use_efc = (opt & TPO_USE_EFC) == TPO_USE_EFC;
                                tpp.p_use_nxpd = (addlopt & TPAO_USE_NXPD) == TPAO_USE_NXPD;
                                tpp.p_use_rcc = (addlopt & TPAO_USE_RCC) == TPAO_USE_RCC;
                                tpp.p_use_efc = (opt & TPO_USE_EFC) == TPO_USE_EFC;
                                tpp.p_use_nxpd = (addlopt & TPAO_USE_NXPD) == TPAO_USE_NXPD;
                                tpp.p_use_rcc = (addlopt & TPAO_USE_RCC) == TPAO_USE_RCC;

-#endif notdef
+#endif /* notdef */

 
                        CHECK(
                                tp_consistency(tpcb, TP_FORCE, &tpp) != 0, 
 
                        CHECK(
                                tp_consistency(tpcb, TP_FORCE, &tpp) != 0, 


@@ -1240,7 +1240,7 @@ again:
 #else
                                e.ATTR(AK_TPDU).e_cdt = hdr->tpdu_AKcdtX;
                                e.ATTR(AK_TPDU).e_seq = hdr->tpdu_AKseqX;
 #else
                                e.ATTR(AK_TPDU).e_cdt = hdr->tpdu_AKcdtX;
                                e.ATTR(AK_TPDU).e_seq = hdr->tpdu_AKseqX;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                e.ATTR(AK_TPDU).e_cdt = hdr->tpdu_AKcdt;
                                e.ATTR(AK_TPDU).e_seq = hdr->tpdu_AKseq;
                        } else {
                                e.ATTR(AK_TPDU).e_cdt = hdr->tpdu_AKcdt;
                                e.ATTR(AK_TPDU).e_seq = hdr->tpdu_AKseq;


@@ -1265,7 +1265,7 @@ again:
                                e.ATTR(XAK_TPDU).e_seq = seqeotX.s_seq;
 #else
                                e.ATTR(XAK_TPDU).e_seq = hdr->tpdu_XAKseqX;
                                e.ATTR(XAK_TPDU).e_seq = seqeotX.s_seq;
 #else
                                e.ATTR(XAK_TPDU).e_seq = hdr->tpdu_XAKseqX;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                e.ATTR(XAK_TPDU).e_seq = hdr->tpdu_XAKseq;
                        }
                        } else {
                                e.ATTR(XAK_TPDU).e_seq = hdr->tpdu_XAKseq;
                        }


@@ -1283,7 +1283,7 @@ again:
                                e.ATTR(XPD_TPDU).e_seq = seqeotX.s_seq;
 #else
                                e.ATTR(XPD_TPDU).e_seq = hdr->tpdu_XPDseqX;
                                e.ATTR(XPD_TPDU).e_seq = seqeotX.s_seq;
 #else
                                e.ATTR(XPD_TPDU).e_seq = hdr->tpdu_XPDseqX;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                e.ATTR(XPD_TPDU).e_seq = hdr->tpdu_XPDseq;
                        }
                        } else {
                                e.ATTR(XPD_TPDU).e_seq = hdr->tpdu_XPDseq;
                        }


@@ -1319,7 +1319,7 @@ again:
 #else
                                e.ATTR(DT_TPDU).e_seq = hdr->tpdu_DTseqX;
                                e.ATTR(DT_TPDU).e_eot = hdr->tpdu_DTeotX;
 #else
                                e.ATTR(DT_TPDU).e_seq = hdr->tpdu_DTseqX;
                                e.ATTR(DT_TPDU).e_eot = hdr->tpdu_DTeotX;

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

                        } else {
                                e.ATTR(DT_TPDU).e_seq = hdr->tpdu_DTseq;
                                e.ATTR(DT_TPDU).e_eot = hdr->tpdu_DTeot;
                        } else {
                                e.ATTR(DT_TPDU).e_seq = hdr->tpdu_DTseq;
                                e.ATTR(DT_TPDU).e_eot = hdr->tpdu_DTeot;


@@ -1540,7 +1540,7 @@ respond:
 
 #ifdef lint
        printf("",sref,opt);
 
 #ifdef lint
        printf("",sref,opt);

-#endif lint
+#endif /* lint */

        IncStat(ts_recv_drop);
        return (ProtoHook)0;
 }
        IncStat(ts_recv_drop);
        return (ProtoHook)0;
 }

diff --git a/usr/src/sys/netiso/tp_ip.h b/usr/src/sys/netiso/tp_ip.h
index b15cb88..f680556 100644 (file)
--- a/usr/src/sys/netiso/tp_ip.h
+++ b/usr/src/sys/netiso/tp_ip.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_ip.h     7.4 (Berkeley) %G%
+ *     @(#)tp_ip.h     7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -62,4 +62,4 @@ SOFTWARE.
 struct inpcb tp_inpcb; 
        /* queue of active inpcbs for tp ; for tp with dod ip */
 
 struct inpcb tp_inpcb; 
        /* queue of active inpcbs for tp ; for tp with dod ip */
 

-#endif __TP_IP__
+#endif /* __TP_IP__ */

diff --git a/usr/src/sys/netiso/tp_iso.c b/usr/src/sys/netiso/tp_iso.c
index b53d974..ce93b6d 100644 (file)
--- a/usr/src/sys/netiso/tp_iso.c
+++ b/usr/src/sys/netiso/tp_iso.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_iso.c    7.15 (Berkeley) %G%
+ *     @(#)tp_iso.c    7.16 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -664,4 +664,4 @@ tpiso_reset(isop)
 
 }
 
 
 }
 

-#endif ISO
+#endif /* ISO */

diff --git a/usr/src/sys/netiso/tp_meas.c b/usr/src/sys/netiso/tp_meas.c
index fe38e04..23f7e56 100644 (file)
--- a/usr/src/sys/netiso/tp_meas.c
+++ b/usr/src/sys/netiso/tp_meas.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_meas.c   7.5 (Berkeley) %G%
+ *     @(#)tp_meas.c   7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -98,4 +98,4 @@ Tpmeas(ref, kind, timev, seq, win, size)
        tpm->tpm_size = size;
 }
 
        tpm->tpm_size = size;
 }
 

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

diff --git a/usr/src/sys/netiso/tp_meas.h b/usr/src/sys/netiso/tp_meas.h
index 8d63b70..0918d4d 100644 (file)
--- a/usr/src/sys/netiso/tp_meas.h
+++ b/usr/src/sys/netiso/tp_meas.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_meas.h   7.5 (Berkeley) %G%
+ *     @(#)tp_meas.h   7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -65,4 +65,4 @@ extern struct tp_Meas tp_Meas[];
 #define TPtime_open_X          0x28 /* xtd format */
 #define TPtime_close           0x09
 
 #define TPtime_open_X          0x28 /* xtd format */
 #define TPtime_close           0x09
 

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

diff --git a/usr/src/sys/netiso/tp_output.c b/usr/src/sys/netiso/tp_output.c
index 4dced08..06a3047 100644 (file)
--- a/usr/src/sys/netiso/tp_output.c
+++ b/usr/src/sys/netiso/tp_output.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_output.c 7.17 (Berkeley) %G%
+ *     @(#)tp_output.c 7.18 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -585,7 +585,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 #else
                error = EOPNOTSUPP;
                goto done;
 #else
                error = EOPNOTSUPP;
                goto done;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

                
        case TPOPT_CDDATA_CLEAR: 
                if (cmd == PRCO_GETOPT) {
                
        case TPOPT_CDDATA_CLEAR: 
                if (cmd == PRCO_GETOPT) {


@@ -650,9 +650,9 @@ tp_ctloutput(cmd, so, level, optname, mp)
                }
                if( tpcb->tp_perf_on ) 
                        error = tp_setup_perf(tpcb);
                }
                if( tpcb->tp_perf_on ) 
                        error = tp_setup_perf(tpcb);

-#else  TP_PERF_MEAS
+#else  /* TP_PERF_MEAS */

                error = EOPNOTSUPP;
                error = EOPNOTSUPP;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

                break;
 
        default:
                break;
 
        default:

diff --git a/usr/src/sys/netiso/tp_param.h b/usr/src/sys/netiso/tp_param.h
index a33ef76..4262d2b 100644 (file)
--- a/usr/src/sys/netiso/tp_param.h
+++ b/usr/src/sys/netiso/tp_param.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_param.h  7.12 (Berkeley) %G%
+ *     @(#)tp_param.h  7.13 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -188,18 +188,18 @@ extern int N_TPREF;
  *****************************************************/
 #ifndef                TRUE
 #define                TRUE                            1
  *****************************************************/
 #ifndef                TRUE
 #define                TRUE                            1

-#endif         TRUE
+#endif         /* TRUE */

 
 #ifndef                FALSE
 #define                FALSE                           0
 
 #ifndef                FALSE
 #define                FALSE                           0

-#endif         FALSE
+#endif         /* FALSE */

 
 #define                TP_LOCAL                                22
 #define                TP_FOREIGN                              33
 
 #ifndef        EOK
 #define        EOK     0
 
 #define                TP_LOCAL                                22
 #define                TP_FOREIGN                              33
 
 #ifndef        EOK
 #define        EOK     0

-#endif         EOK
+#endif         /* EOK */

 
 #define        TP_CLASS_0      (1<<0)
 #define        TP_CLASS_1      (1<<1)
 
 #define        TP_CLASS_0      (1<<0)
 #define        TP_CLASS_1      (1<<1)


@@ -212,7 +212,7 @@ extern int N_TPREF;
 
 #ifndef        MNULL
 #define        MNULL                           (struct mbuf *)0
 
 #ifndef        MNULL
 #define        MNULL                           (struct mbuf *)0

-#endif         MNULL
+#endif         /* MNULL */

        /* if ../sys/mbuf.h gets MT_types up to 0x40, these will 
         * have to be changed:
         */
        /* if ../sys/mbuf.h gets MT_types up to 0x40, these will 
         * have to be changed:
         */


@@ -319,7 +319,7 @@ bcopy((caddr_t)&(((struct tp_vbp *)(src))->tpv_val),(caddr_t)&(dst),sizeof(type)
     } else \
         (tpcb)->tp_lcredit = xxi; \
 } }
     } else \
         (tpcb)->tp_lcredit = xxi; \
 } }

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 #ifdef KERNEL
 extern int tp_rttadd, tp_rttdiv;
 
 #ifdef KERNEL
 extern int tp_rttadd, tp_rttdiv;


@@ -335,7 +335,7 @@ extern int tp_rttadd, tp_rttdiv;
 #define ATTR(X) ev_union.EV_ ## X
 #endif /* defined(__STDC__) || defined(__cplusplus) */
 
 #define ATTR(X) ev_union.EV_ ## X
 #endif /* defined(__STDC__) || defined(__cplusplus) */
 

-#endif  tp_NSTATES 
-#endif KERNEL
+#endif  /* tp_NSTATES  */
+#endif /* KERNEL */

 
 

-#endif __TP_PARAM__
+#endif /* __TP_PARAM__ */

diff --git a/usr/src/sys/netiso/tp_pcb.c b/usr/src/sys/netiso/tp_pcb.c
index e864c8c..a895675 100644 (file)
--- a/usr/src/sys/netiso/tp_pcb.c
+++ b/usr/src/sys/netiso/tp_pcb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_pcb.c    7.25 (Berkeley) %G%
+ *     @(#)tp_pcb.c    7.26 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -241,7 +241,7 @@ int         in_pcballoc();
 int    tpip_output(); 
 int    tpip_output_dg(); 
 struct inpcb   tp_inpcb;
 int    tpip_output(); 
 int    tpip_output_dg(); 
 struct inpcb   tp_inpcb;

-#endif INET
+#endif /* INET */

 #ifdef ISO
 int            iso_putnetaddr();
 int            iso_getnetaddr();
 #ifdef ISO
 int            iso_putnetaddr();
 int            iso_getnetaddr();


@@ -259,7 +259,7 @@ int         tpclnp_output();
 int    tpclnp_output_dg(); 
 int            iso_nlctloutput();
 struct isopcb  tp_isopcb;
 int    tpclnp_output_dg(); 
 int            iso_nlctloutput();
 struct isopcb  tp_isopcb;

-#endif ISO
+#endif /* ISO */

 #ifdef TPCONS
 int            iso_putnetaddr();
 int            iso_getnetaddr();
 #ifdef TPCONS
 int            iso_putnetaddr();
 int            iso_getnetaddr();


@@ -275,7 +275,7 @@ int         iso_pcbdetach();
 int    iso_pcballoc(); 
 int    tpcons_output(); 
 struct isopcb  tp_isopcb;
 int    iso_pcballoc(); 
 int    tpcons_output(); 
 struct isopcb  tp_isopcb;

-#endif TPCONS
+#endif /* TPCONS */

 
 
 struct nl_protosw nl_protosw[] = {
 
 
 struct nl_protosw nl_protosw[] = {


@@ -292,7 +292,7 @@ struct nl_protosw nl_protosw[] = {
                },
 #else
        { 0 },
                },
 #else
        { 0 },

-#endif ISO
+#endif /* ISO */

        /* IN_CLNS */
 #ifdef INET
        { AF_INET, in_putnetaddr, in_getnetaddr, in_cmpnetaddr,
        /* IN_CLNS */
 #ifdef INET
        { AF_INET, in_putnetaddr, in_getnetaddr, in_cmpnetaddr,


@@ -306,7 +306,7 @@ struct nl_protosw nl_protosw[] = {
                },
 #else
        { 0 },
                },
 #else
        { 0 },

-#endif INET
+#endif /* INET */

        /* ISO_CONS */
 #if defined(ISO) && defined(TPCONS)
        { AF_ISO, iso_putnetaddr, iso_getnetaddr, iso_cmpnetaddr,
        /* ISO_CONS */
 #if defined(ISO) && defined(TPCONS)
        { AF_ISO, iso_putnetaddr, iso_getnetaddr, iso_cmpnetaddr,


@@ -320,7 +320,7 @@ struct nl_protosw nl_protosw[] = {
                },
 #else
        { 0 },
                },
 #else
        { 0 },

-#endif ISO_CONS
+#endif /* ISO_CONS */

        /* End of protosw marker */
        { 0 }
 };
        /* End of protosw marker */
        { 0 }
 };


@@ -847,7 +847,7 @@ tp_detach(tpcb)
                tpcb->tp_p_meas = 0;
                tpcb->tp_p_mbuf = 0;
        }
                tpcb->tp_p_meas = 0;
                tpcb->tp_p_mbuf = 0;
        }

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
        IFDEBUG(D_CONN)
                printf( "end of detach, NOT single, tpcb 0x%x\n", tpcb);
 
        IFDEBUG(D_CONN)
                printf( "end of detach, NOT single, tpcb 0x%x\n", tpcb);

diff --git a/usr/src/sys/netiso/tp_pcb.h b/usr/src/sys/netiso/tp_pcb.h
index fe1326c..8bde24b 100644 (file)
--- a/usr/src/sys/netiso/tp_pcb.h
+++ b/usr/src/sys/netiso/tp_pcb.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_pcb.h    7.24 (Berkeley) %G%
+ *     @(#)tp_pcb.h    7.25 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -52,7 +52,7 @@ SOFTWARE.
 #include <netiso/tp_user.h>
 #ifndef sblock
 #include <sys/socketvar.h>
 #include <netiso/tp_user.h>
 #ifndef sblock
 #include <sys/socketvar.h>

-#endif sblock
+#endif /* sblock */

 
 /* NOTE: the code depends on REF_CLOSED > REF_OPEN > the rest, and
  * on REF_FREE being zero
 
 /* NOTE: the code depends on REF_CLOSED > REF_OPEN > the rest, and
  * on REF_FREE being zero


@@ -248,7 +248,7 @@ struct tp_pcb {
        /* performance stats - see tp_stat.h */
        struct tp_pmeas         *tp_p_meas;
        struct mbuf                     *tp_p_mbuf;
        /* performance stats - see tp_stat.h */
        struct tp_pmeas         *tp_p_meas;
        struct mbuf                     *tp_p_mbuf;

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
        /* addressing */
        u_short                         tp_domain;              /* domain (INET, ISO) */
 
        /* addressing */
        u_short                         tp_domain;              /* domain (INET, ISO) */


@@ -327,4 +327,4 @@ extern struct tp_pcb        *tp_ftimeolist;
 #define        tpcbtoso(tp)    ((struct socket *)((tp)->tp_sock))
 #define        tpcbtoref(tp)   ((struct tp_ref *)((tp)->tp_ref))
 
 #define        tpcbtoso(tp)    ((struct socket *)((tp)->tp_sock))
 #define        tpcbtoref(tp)   ((struct tp_ref *)((tp)->tp_ref))
 

-#endif  __TP_PCB__
+#endif  /* __TP_PCB__ */

diff --git a/usr/src/sys/netiso/tp_seq.h b/usr/src/sys/netiso/tp_seq.h
index 2368b2a..fc05a62 100644 (file)
--- a/usr/src/sys/netiso/tp_seq.h
+++ b/usr/src/sys/netiso/tp_seq.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_seq.h    7.5 (Berkeley) %G%
+ *     @(#)tp_seq.h    7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -95,4 +95,4 @@ SOFTWARE.
 #define IN_SWINDOW(tpcb, seq, lwe, uwe)\
        ( SEQ_GT(tpcb, seq, lwe) && SEQ_LEQ(tpcb, seq, uwe) )
 
 #define IN_SWINDOW(tpcb, seq, lwe, uwe)\
        ( SEQ_GT(tpcb, seq, lwe) && SEQ_LEQ(tpcb, seq, uwe) )
 

-#endif __TP_SEQ__
+#endif /* __TP_SEQ__ */

diff --git a/usr/src/sys/netiso/tp_stat.h b/usr/src/sys/netiso/tp_stat.h
index 20a9408..1fe7576 100644 (file)
--- a/usr/src/sys/netiso/tp_stat.h
+++ b/usr/src/sys/netiso/tp_stat.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_stat.h   7.7 (Berkeley) %G%
+ *     @(#)tp_stat.h   7.8 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -252,6 +252,6 @@ int PStat_Junk;
 #define IFPERF(x)      if (0) {
 #define ENDPERF }
 
 #define IFPERF(x)      if (0) {
 #define ENDPERF }
 

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
 

-#endif __TP_STAT__
+#endif /* __TP_STAT__ */

diff --git a/usr/src/sys/netiso/tp_subr.c b/usr/src/sys/netiso/tp_subr.c
index 038b4cf..a8e6a0a 100644 (file)
--- a/usr/src/sys/netiso/tp_subr.c
+++ b/usr/src/sys/netiso/tp_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_subr.c   7.20 (Berkeley) %G%
+ *     @(#)tp_subr.c   7.21 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -442,7 +442,7 @@ tp_send(tpcb)
 #ifdef TP_PERF_MEAS
        int                                             send_start_time = ticks;
        SeqNum                                  oldnxt = tpcb->tp_sndnxt; 
 #ifdef TP_PERF_MEAS
        int                                             send_start_time = ticks;
        SeqNum                                  oldnxt = tpcb->tp_sndnxt; 

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
        idle = (tpcb->tp_snduna == tpcb->tp_sndnew);
        if (idle) {
 
        idle = (tpcb->tp_snduna == tpcb->tp_sndnew);
        if (idle) {


@@ -584,7 +584,7 @@ send:
                                        TPsbsend, &elapsed, newseq, tpcb->tp_Nwindow, npkts);
                }
        ENDPERF
                                        TPsbsend, &elapsed, newseq, tpcb->tp_Nwindow, npkts);
                }
        ENDPERF

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
 
        IFTRACE(D_DATA)
 
 
        IFTRACE(D_DATA)


@@ -703,9 +703,9 @@ tp_stash(tpcb, e)
                                                                        /* 1--> ack each tpdu */
 #ifndef lint
 #define E e->ATTR(DT_TPDU)
                                                                        /* 1--> ack each tpdu */
 #ifndef lint
 #define E e->ATTR(DT_TPDU)

-#else lint
+#else /* lint */

 #define E e->ev_union.EV_DT_TPDU
 #define E e->ev_union.EV_DT_TPDU

-#endif lint
+#endif /* lint */

 
        if ( E.e_eot ) {
                register struct mbuf *n = E.e_data;
 
        if ( E.e_eot ) {
                register struct mbuf *n = E.e_data;

diff --git a/usr/src/sys/netiso/tp_subr2.c b/usr/src/sys/netiso/tp_subr2.c
index 24ed87c..7c52947 100644 (file)
--- a/usr/src/sys/netiso/tp_subr2.c
+++ b/usr/src/sys/netiso/tp_subr2.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_subr2.c  7.21 (Berkeley) %G%
+ *     @(#)tp_subr2.c  7.22 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -404,7 +404,7 @@ tp_netcmd( tpcb, cmd )
                printf("tp_netcmd(0x%x, 0x%x) NOT IMPLEMENTED\n", tpcb, cmd);
                break;
        }
                printf("tp_netcmd(0x%x, 0x%x) NOT IMPLEMENTED\n", tpcb, cmd);
                break;
        }

-#else TPCONS
+#else /* TPCONS */

        printf("tp_netcmd(): X25 NOT CONFIGURED!!\n");
 #endif
 }
        printf("tp_netcmd(): X25 NOT CONFIGURED!!\n");
 #endif
 }


@@ -694,9 +694,9 @@ tp0_stash( tpcb, e )
 {
 #ifndef lint
 #define E e->ATTR(DT_TPDU)
 {
 #ifndef lint
 #define E e->ATTR(DT_TPDU)

-#else lint
+#else /* lint */

 #define E e->ev_union.EV_DT_TPDU
 #define E e->ev_union.EV_DT_TPDU

-#endif lint
+#endif /* lint */

 
        register struct sockbuf *sb = &tpcb->tp_sock->so_rcv;
        register struct isopcb *isop = (struct isopcb *)tpcb->tp_npcb;
 
        register struct sockbuf *sb = &tpcb->tp_sock->so_rcv;
        register struct isopcb *isop = (struct isopcb *)tpcb->tp_npcb;


@@ -794,7 +794,7 @@ tp_setup_perf(tpcb)
        }
        return 0;
 }
        }
        return 0;
 }

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */

 
 #ifdef ARGO_DEBUG
 dump_addr (addr)
 
 #ifdef ARGO_DEBUG
 dump_addr (addr)


@@ -808,7 +808,7 @@ dump_addr (addr)
                case AF_ISO:
                        dump_isoaddr((struct sockaddr_iso *)addr);
                        break;
                case AF_ISO:
                        dump_isoaddr((struct sockaddr_iso *)addr);
                        break;

-#endif ISO
+#endif /* ISO */

                default:
                        printf("BAD AF: 0x%x\n", addr->sa_family);
                        break;
                default:
                        printf("BAD AF: 0x%x\n", addr->sa_family);
                        break;


@@ -851,7 +851,4 @@ int         len;
                printf("\n");
        }
 }
                printf("\n");
        }
 }

-
-
-#endif ARGO_DEBUG
-
+#endif /* ARGO_DEBUG */

diff --git a/usr/src/sys/netiso/tp_timer.h b/usr/src/sys/netiso/tp_timer.h
index 9b39874..c55aade 100644 (file)
--- a/usr/src/sys/netiso/tp_timer.h
+++ b/usr/src/sys/netiso/tp_timer.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_timer.h  7.7 (Berkeley) %G%
+ *     @(#)tp_timer.h  7.8 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -62,6 +62,6 @@ SOFTWARE.
 #define tp_euntimeout tp_cuntimeout
 #define tp_ctimeout_MIN(p, w, t) \
     { if((p)->tp_timer[w] > (t)) (p)->tp_timer[w] = (t);}
 #define tp_euntimeout tp_cuntimeout
 #define tp_ctimeout_MIN(p, w, t) \
     { if((p)->tp_timer[w] > (t)) (p)->tp_timer[w] = (t);}

-#endif TP_DEBUG_TIMERS
+#endif /* TP_DEBUG_TIMERS */

 
 

-#endif __TP_TIMER__
+#endif /* __TP_TIMER__ */

diff --git a/usr/src/sys/netiso/tp_tpdu.h b/usr/src/sys/netiso/tp_tpdu.h
index 72a151a..ebb7bb3 100644 (file)
--- a/usr/src/sys/netiso/tp_tpdu.h
+++ b/usr/src/sys/netiso/tp_tpdu.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_tpdu.h   7.4 (Berkeley) %G%
+ *     @(#)tp_tpdu.h   7.5 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -60,7 +60,7 @@ SOFTWARE.
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif
 #else
 #define        BYTE_ORDER      BIG_ENDIAN      /* mc68000, tahoe, most others */
 #endif

-#endif BYTE_ORDER
+#endif /* BYTE_ORDER */

 
 /* This much of a tpdu is the same for all types of tpdus  (except
  * DT tpdus in class 0; their exceptions are handled by the data
 
 /* This much of a tpdu is the same for all types of tpdus  (except
  * DT tpdus in class 0; their exceptions are handled by the data


@@ -267,4 +267,4 @@ struct tpdu {
        union   tpdu_fixed_rest _tpdufr;
 };
 
        union   tpdu_fixed_rest _tpdufr;
 };
 

-#endif __TP_TPDU__
+#endif /* __TP_TPDU__ */

diff --git a/usr/src/sys/netiso/tp_trace.c b/usr/src/sys/netiso/tp_trace.c
index 5e12117..024459a 100644 (file)
--- a/usr/src/sys/netiso/tp_trace.c
+++ b/usr/src/sys/netiso/tp_trace.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_trace.c  7.5 (Berkeley) %G%
+ *     @(#)tp_trace.c  7.6 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -146,4 +146,4 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
                break;
        }
 }
                break;
        }
 }

-#endif TPPT
+#endif /* TPPT */

diff --git a/usr/src/sys/netiso/tp_trace.h b/usr/src/sys/netiso/tp_trace.h
index 867e1a9..88ee56d 100644 (file)
--- a/usr/src/sys/netiso/tp_trace.h
+++ b/usr/src/sys/netiso/tp_trace.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_trace.h  7.7 (Berkeley) %G%
+ *     @(#)tp_trace.h  7.8 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -123,7 +123,7 @@ struct      tp_Trace {
 #define tpt_window tpt_stuff.tpt_Time.tptv_window
 #define tpt_size tpt_stuff.tpt_Time.tptv_size
 
 #define tpt_window tpt_stuff.tpt_Time.tptv_window
 #define tpt_size tpt_stuff.tpt_Time.tptv_size
 

-#endif defined(TP_TRACEFILE)||!defined(KERNEL)
+#endif /* defined(TP_TRACEFILE)||!defined(KERNEL) */

 
 
 #ifdef TPPT
 
 
 #ifdef TPPT


@@ -152,7 +152,7 @@ int tp_Tracen = 0;
 #define ENDTRACE  }
 
 
 #define ENDTRACE  }
 
 

-#else  TPPT
+#else  /* TPPT */

 
 /***********************************************
  * NO TPPT TRACE STUFF
 
 /***********************************************
  * NO TPPT TRACE STUFF


@@ -165,8 +165,8 @@ int tp_Tracen = 0;
 #define IFTRACE(ascii)  if (0) {
 #define ENDTRACE        }
 
 #define IFTRACE(ascii)  if (0) {
 #define ENDTRACE        }
 

-#endif TPPT
+#endif /* TPPT */

 
 
 
 
 
 

-#endif __TP_TRACE__
+#endif /* __TP_TRACE__ */

diff --git a/usr/src/sys/netiso/tp_user.h b/usr/src/sys/netiso/tp_user.h
index 02c0126..8c74727 100644 (file)
--- a/usr/src/sys/netiso/tp_user.h
+++ b/usr/src/sys/netiso/tp_user.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_user.h   7.13 (Berkeley) %G%
+ *     @(#)tp_user.h   7.14 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -133,4 +133,4 @@ struct tp_disc_reason {
  */
 
 
  */
 
 

-#endif __TP_USER__
+#endif /* __TP_USER__ */

diff --git a/usr/src/sys/netiso/tp_usrreq.c b/usr/src/sys/netiso/tp_usrreq.c
index 83fb3d7..55eb28f 100644 (file)
--- a/usr/src/sys/netiso/tp_usrreq.c
+++ b/usr/src/sys/netiso/tp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tp_usrreq.c 7.27 (Berkeley) %G%
+ *     @(#)tp_usrreq.c 7.28 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -113,7 +113,7 @@ dump_mbuf(n, str)
                                }
                                printf("\n");
                        }
                                }
                                printf("\n");
                        }

-#endif notdef
+#endif /* notdef */

                        if (n->m_next == n) {
                                printf("LOOP!\n");
                                return;
                        if (n->m_next == n) {
                                printf("LOOP!\n");
                                return;


@@ -125,7 +125,7 @@ dump_mbuf(n, str)
        printf("\n");
 }
 
        printf("\n");
 }
 

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

 
 /*
  * CALLED FROM:
 
 /*
  * CALLED FROM:


@@ -653,7 +653,7 @@ tp_usrreq(so, req, m, nam, controlp)
        default:
 #ifdef ARGO_DEBUG
                printf("tp_usrreq UNKNOWN PRU %d\n", req);
        default:
 #ifdef ARGO_DEBUG
                printf("tp_usrreq UNKNOWN PRU %d\n", req);

-#endif ARGO_DEBUG
+#endif /* ARGO_DEBUG */

                error = EOPNOTSUPP;
        }
 
                error = EOPNOTSUPP;
        }
 

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index 4f72786..0905016 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)idp_usrreq.c        7.12 (Berkeley) %G%
+ *     @(#)idp_usrreq.c        7.13 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -227,7 +227,7 @@ idp_output(nsp, m0)
                }
        }
        nsp->nsp_lastdst = idp->idp_dna;
                }
        }
        nsp->nsp_lastdst = idp->idp_dna;

-#endif ancient_history
+#endif /* ancient_history */

        if (noIdpRoute) ro = 0;
        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }
        if (noIdpRoute) ro = 0;
        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }


@@ -331,7 +331,7 @@ idp_ctloutput(req, so, level, name, value)
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;

-#endif NSIP
+#endif /* NSIP */

                default:
                        error = EINVAL;
                }
                default:
                        error = EINVAL;
                }

diff --git a/usr/src/sys/netns/spp_usrreq.c b/usr/src/sys/netns/spp_usrreq.c
index 3c03b2b..da75db2 100644 (file)
--- a/usr/src/sys/netns/spp_usrreq.c
+++ b/usr/src/sys/netns/spp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)spp_usrreq.c        7.16 (Berkeley) %G%
+ *     @(#)spp_usrreq.c        7.17 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1775,4 +1775,4 @@ spp_timers(cb, timer)
 #ifndef lint
 int SppcbSize = sizeof (struct sppcb);
 int NspcbSize = sizeof (struct nspcb);
 #ifndef lint
 int SppcbSize = sizeof (struct sppcb);
 int NspcbSize = sizeof (struct nspcb);

-#endif lint
+#endif /* lint */

diff --git a/usr/src/sys/stand.att/stat.c b/usr/src/sys/stand.att/stat.c
index 891d9f1..94bf1b0 100644 (file)
--- a/usr/src/sys/stand.att/stat.c
+++ b/usr/src/sys/stand.att/stat.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stat.c      7.3 (Berkeley) %G%
+ *     @(#)stat.c      7.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -45,4 +45,4 @@ stat(str, sb)
        close(fd);
        return(rv);
 }
        close(fd);
        return(rv);
 }

-#endif SMALL
+#endif /* SMALL */