CVS: The file 'linux/drivers/char/bluetooth/btmem.c' has been modified.

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

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btmem.c         1.38            1.39=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Replaced FNC with __FUNCTION__.


The diff of the modified file(s):

--- btmem.c	2001/03/23 13:12:45	1.38
+++ btmem.c	2001/03/23 13:21:57	1.39
@@ -214,7 +214,6 @@
=20
 bt_tx_buf* subscribe_bt_buf(s32 send_len)
 {
-#define FNC "subscribe_bt_buf : "
 	bt_tx_buf *tx;
 	s32 buf_len; /* Total size of bt_tx_object */
 	u32 head_free;
@@ -222,7 +221,7 @@
=20
 	cli();
 	buf_len =3D send_len + BT_TX_HDRSIZE;=20=20
-	D_MEM(FNC"buf_len %d\n", buf_len);
+	D_MEM(__FUNCTION__ ": buf_len %d\n", buf_len);
=20
 	/*=20=20
 	    'Normal' case
@@ -243,7 +242,7 @@
 		head_free =3D (bt_buf.send - bt_buf.head);
=20
 		if (tail_free >=3D buf_len) {
-			D_MEM(FNC"subscribe in tail at pos %d\n",=20
+			D_MEM(__FUNCTION__ ": subscribe in tail at pos %d\n",=20
 			      bt_buf.free - bt_buf.head);
 			tx =3D (bt_tx_buf *)bt_buf.free;
 			/* Don't touch send, only update free and count */
@@ -261,8 +260,8 @@
 			bt_buf.nbr_bufs++;
 			bt_buf.count +=3D buf_len;
 		} else {
-			D_ERR(FNC"Cannot subscribe %d bytes !\n", send_len);
-			D_ERR(FNC"Only %d available (non - fragmented)\n",
+			D_ERR(__FUNCTION__ ": Cannot subscribe %d bytes !\n", send_len);
+			D_ERR(__FUNCTION__ ": Only %d available (non - fragmented)\n",
 			      buf_write_room());
=20
 #if PANIC_AT_ERROR
@@ -292,8 +291,8 @@
 			btmem_reset();
=20=09=09=09
 			if (buf_len > bt_buf.size) {
-			  D_ERR(FNC"Cannot subscribe %d bytes !\n", send_len);=20
-			  D_ERR(FNC"Only %d available (non - fragmented)\n",
+				D_ERR(__FUNCTION__ ": Cannot subscribe %d bytes !\n", send_len);=20
+				D_ERR(__FUNCTION__ ": Only %d available (non - fragmented)\n",
 				buf_write_room());
 			  btmem_get_status(NULL);
 			  sti();
@@ -307,9 +306,9 @@
 			bt_buf.count +=3D buf_len;
 			bt_buf.nbr_bufs++;
 		} else {
-			D_ERR(FNC"Cannot subscribe requested size (%d) !\n",=20
+			D_ERR(__FUNCTION__ ": Cannot subscribe requested size (%d) !\n",=20
 			      send_len);
-			D_ERR(FNC"Only %d available (non - fragmented)\n",
+			D_ERR(__FUNCTION__ ": Only %d available (non - fragmented)\n",
 			      buf_write_room());
 			btmem_get_status(NULL);
 #if PANIC_AT_ERROR
@@ -326,7 +325,6 @@
=20
 	sti();
 	return tx;
-#undef FNC
 }
=20
 /* Returns number of buffers */
@@ -366,7 +364,6 @@
 		   don't count a tossed tail ! */
 		space_left =3D  (BT_BUF_SIZE -=20
 			       (bt_buf.tail - bt_buf.toss_tail) - bt_buf.count);
-=20=20
 	}
=20
 	space_left  -=3D (BT_TX_HDRSIZE+BTMEM_EXTRASPACE);
@@ -432,14 +429,13 @@
=20
 void unsubscribe_bt_buf(bt_tx_buf *tx)
 {
-#define FNC "unsubscribe_bt_buf : "
 	s32 tail_free; /* for debug */
 	s32 head_free;
=20
         if (!tx)
                 return;
=20
-	D_MEM(FNC"%d bytes (not incl hdrs) at pos %d\n",=20
+	D_MEM(__FUNCTION__ ": %d bytes (not incl hdrs) at pos %d\n",=20
 	      tx->subscr_len, (u8 *)tx - bt_buf.head);
=20=20=20
 	/* Check that tx is valid for unssubscribe. We must process the=20
@@ -453,12 +449,12 @@
 			bt_buf.count  -=3D (tx->subscr_len + BT_TX_HDRSIZE);
 			bt_buf.nbr_bufs--;=20=20=20=20=20=20
 		} else {
-			D_ERR(FNC"failed, out of boundary\n");
+			D_ERR(__FUNCTION__ ": failed, out of boundary\n");
 		}
 	} else if (bt_buf.count =3D=3D 0)
-		D_MEM(FNC"no data in buffer\n");
+		D_MEM(__FUNCTION__ ": no data in buffer\n");
 	else {
-		D_ERR(FNC"invalid data segment!\n");
+		D_ERR(__FUNCTION__ ": invalid data segment!\n");
 #ifdef __KERNEL__
=20
 		D_ERR("pid : %d (tx:0x%x - send:0x%x=3D%d) send:%ld free:%ld\n",
@@ -486,7 +482,7 @@
=20
 	/* Is also checked done in get_bt_buf */
 	if (bt_buf.send =3D=3D bt_buf.toss_tail) {
-		D_MEM(FNC"toss_tail, now send pos is 0\n");
+		D_MEM(__FUNCTION__ ": toss_tail, now send pos is 0\n");
 		bt_buf.send =3D bt_buf.head;
 		bt_buf.toss_tail =3D bt_buf.tail;
=20