BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / telnet / ring.c

diff --git a/usr/src/usr.bin/telnet/ring.c b/usr/src/usr.bin/telnet/ring.c
index b743913..2d9f0b0 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.c
+++ b/usr/src/usr.bin/telnet/ring.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)ring.c     1.13 (Berkeley) 6/28/90";
+#endif /* not lint */
+

 /*
  * This defines a structure for a ring buffer.
  *
 /*
  * This defines a structure for a ring buffer.
  *


@@ -17,7 +40,9 @@
 #endif
 
 #include       <sys/types.h>
 #endif
 
 #include       <sys/types.h>

+#ifndef        FILIO_H

 #include       <sys/ioctl.h>
 #include       <sys/ioctl.h>

+#endif

 #include       <sys/socket.h>
 
 #include       "ring.h"
 #include       <sys/socket.h>
 
 #include       "ring.h"


@@ -29,7 +54,7 @@
 #define        MIN(a,b)        (((a)<(b))? (a):(b))
 #endif /* !defined(MIN) */
 
 #define        MIN(a,b)        (((a)<(b))? (a):(b))
 #endif /* !defined(MIN) */
 

-#define        ring_subtract(d,a,b)    ((((int)(a))-((int)(b)) >= 0)? \
+#define        ring_subtract(d,a,b)    (((a)-(b) >= 0)? \

                                        (a)-(b): (((a)-(b))+(d)->size))
 
 #define        ring_increment(d,a,c)   (((a)+(c) < (d)->top)? \
                                        (a)-(b): (((a)-(b))+(d)->size))
 
 #define        ring_increment(d,a,c)   (((a)+(c) < (d)->top)? \


@@ -250,6 +275,7 @@ int count;
     }
 }
 
     }
 }
 

+#ifdef notdef

 
 /*
  * Move data from the "consume" portion of the ring buffer
 
 /*
  * Move data from the "consume" portion of the ring buffer


@@ -270,3 +296,4 @@ int count;
        buffer += i;
     }
 }
        buffer += i;
     }
 }

+#endif