BSD 4_4 release

[unix-history] / usr / src / sys / netiso / tp_subr2.c

diff --git a/usr/src/sys/netiso/tp_subr2.c b/usr/src/sys/netiso/tp_subr2.c
index 24ed87c..60c7ce2 100644 (file)
--- a/usr/src/sys/netiso/tp_subr2.c
+++ b/usr/src/sys/netiso/tp_subr2.c
@@ -1,10 +1,36 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * %sccs.include.redist.c%
- *
- *     @(#)tp_subr2.c  7.21 (Berkeley) %G%
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)tp_subr2.c  8.1 (Berkeley) 6/10/93

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


@@ -404,7 +430,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 +720,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 +820,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 +834,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 +877,4 @@ int         len;
                printf("\n");
        }
 }
                printf("\n");
        }
 }

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