CVS: 3 files have been modified in linux/drivers/char/bluetooth.

[Peter K. <pk...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btmem.c         1.43            1.44=20=20=20=20=20=20=20=20=20=20=20=20
l2cap.c         1.122           1.123=20=20=20=20=20=20=20=20=20=20=20
test.c          1.31            1.32=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Make sure macro arguments are enclosed by parentheses.


The diff of the modified file(s):

--- btmem.c	2001/06/19 06:13:01	1.43
+++ btmem.c	2001/10/22 13:25:54	1.44
@@ -77,7 +77,7 @@
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#define BUFFER_USAGE_LEVEL(usage) ((usage*100)/(int)(BT_BUF_SIZE))
+#define BUFFER_USAGE_LEVEL(usage) (((usage)*100)/(int)(BT_BUF_SIZE))
=20
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20
--- l2cap.c	2001/10/16 10:51:29	1.122
+++ l2cap.c	2001/10/22 13:25:54	1.123
@@ -88,7 +88,7 @@
 #if L2CAP_DEBUG_STATE
 /* State machine */
 #define D_STATE(fmt...) printk(L2CAP_DBG_STR fmt)
-#define PRINTSTATE(con) (printk(L2CAP_DBG_STR "Current state of (%d:%d) is=
 %s\n", con->local_cid, con->remote_cid, state_name[con->current_state]))
+#define PRINTSTATE(con) (printk(L2CAP_DBG_STR "Current state of (%d:%d) is=
 %s\n", (con)->local_cid, (con)->remote_cid, state_name[(con)->current_stat=
e]))
 #else
 /* State machine */
 #define D_STATE(fmt...)
@@ -149,15 +149,16 @@
 #define MAX_CID 0xffff
=20
 /* EVEN =3D> REQUEST */=20
-#define ISREQUEST(x) (!(x%2))
-#define SET_L2CAP_HDR(frame, len, cid) {\
+#define ISREQUEST(x) (!((x) % 2))
+#define SET_L2CAP_HDR(frame, len, cid)                 \
+do {                                                   \
         (*(u8 *)(frame)) =3D (u8)(((len) & 0xff)); \
-        (*(u8 *)(frame + 1)) =3D (u8)((len) >> 8); \
-        (*(u8 *)(frame + 2)) =3D (u8)(((cid) & 0xff)); \
-        (*(u8 *)(frame + 3)) =3D (u8)((cid) >> 8); \
-}
+        (*(u8 *)((frame) + 1)) =3D (u8)((len) >> 8);     \
+        (*(u8 *)((frame) + 2)) =3D (u8)(((cid) & 0xff)); \
+        (*(u8 *)((frame) + 3)) =3D (u8)((cid) >> 8);     \
+} while (0)
=20
-#define ENTERSTATE(con, state) (con->current_state =3D state)
+#define ENTERSTATE(con, state) ((con)->current_state =3D state)
=20
 #define RCID_NOT_SET 0
 #define RCID_SET 1
@@ -168,38 +169,6 @@
=20
 #define CONFREQ_NO_OPTIONS 0x11
=20
-const u8* psm2str(u16 psm)
-{
-	switch (psm) {
-	case 1:
-		return "SDP";
-		break;
-
-	case 3:
-		return "RFCOMM";
-		break;
-
-	case 5:
-		return "TCS";
-		break;
-
-	case 0x1231:
-		return "TEST";
-		break;
-
-	case 0x1233:
-		return "TEST-2";
-		break;
-
-	case 0x4561:
-		return "TEST-3";
-		break;
-
-	default :
-		return "unknown";
-	}
-}
-
 const u8* cmdrej_reason[] =3D {
 	"Command not understood",
 	"Signalling MTU exceeded",
@@ -3296,6 +3265,7 @@
 		       (unsigned int)f->latency, (unsigned int)f->delay);
 	}
 }
+
 /* Returns a free cid in range 0x0040 - 0xffff */
 /* FIXME - search from MIN_CID every time ? */
 u16 get_cid(void)
@@ -3313,6 +3283,32 @@
 		else if (i =3D=3D MAX_CID)
 			return 0;
 		i++;
+	}
+}
+
+const u8* psm2str(u16 psm)
+{
+	switch (psm) {
+	case 1:
+		return "SDP";
+
+	case 3:
+		return "RFCOMM";
+
+	case 5:
+		return "TCS";
+
+	case 0x1231:
+		return "TEST";
+
+	case 0x1233:
+		return "TEST-2";
+
+	case 0x4561:
+		return "TEST-3";
+
+	default:
+		return "Unknown";
 	}
 }
=20
--- test.c	2001/10/18 15:49:25	1.31
+++ test.c	2001/10/22 13:25:54	1.32
@@ -79,7 +79,7 @@
 /* State machine */
 #define D_STATE(fmt...) printk(TEST_DBG_STR fmt)
 #define PRINTSTATE(con) (printk("Current state : %s\n",\
-                         state_name[con->current_state]))
+                         state_name[(con)->current_state]))
 #else
 /* State machine */
 #define D_STATE(fmt)
@@ -121,7 +121,7 @@
 #define TEST_FLUSH_TIMEOUT 0xffff=20
 /* Reliable channel, infinite amout of retransmissions */
=20
-#define PRINTPSM(con) (printk("PSM : 0x%x\n", con->psm))
+#define PRINTPSM(con) (printk("PSM : 0x%x\n", (con)->psm))
=20
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20