more cleanups; make so_oobmark unsigned too

SCCS-vsn: sys/sys/socketvar.h 6.9

diff --git a/usr/src/sys/sys/socketvar.h b/usr/src/sys/sys/socketvar.h
index 67356f4..3fcbd8b 100644 (file)
--- a/usr/src/sys/sys/socketvar.h
+++ b/usr/src/sys/sys/socketvar.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)socketvar.h 6.8 (Berkeley) %G%
+ *     @(#)socketvar.h 6.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -58,7 +58,7 @@ struct socket {
 #define        SB_COLL         0x10            /* collision selecting */
        short   so_timeo;               /* connection timeout */
        u_short so_error;               /* error affecting connection */
 #define        SB_COLL         0x10            /* collision selecting */
        short   so_timeo;               /* connection timeout */
        u_short so_error;               /* error affecting connection */

-       short   so_oobmark;             /* chars to oob mark */
+       u_short so_oobmark;             /* chars to oob mark */

        short   so_pgrp;                /* pgrp for signals */
 };
 
        short   so_pgrp;                /* pgrp for signals */
 };
 


@@ -84,8 +84,8 @@ struct socket {
 
 /* how much space is there in a socket buffer (so->so_snd or so->so_rcv) */
 #define        sbspace(sb) \
 
 /* how much space is there in a socket buffer (so->so_snd or so->so_rcv) */
 #define        sbspace(sb) \

-    (MIN((((int)(sb)->sb_hiwat)-(int)(sb)->sb_cc),\
-        (((int)(sb)->sb_mbmax)-(int)(sb)->sb_mbcnt)))
+    (MIN((int)((sb)->sb_hiwat - (sb)->sb_cc),\
+        (int)((sb)->sb_mbmax - (sb)->sb_mbcnt)))

 
 /* do we have to send all at once on a socket? */
 #define        sosendallatonce(so) \
 
 /* do we have to send all at once on a socket? */
 #define        sosendallatonce(so) \