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

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

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

Name          Old version  New version  Tag  Comment
----          -----------  -----------  ---  -------
sec_client.c  1.24         1.25=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Fixed two compiler warnings.


The diff of the modified file(s):

--- sec_client.c	11 Apr 2002 11:52:14 -0000	1.24
+++ sec_client.c	1 Aug 2002 16:16:09 -0000	1.25
@@ -157,8 +157,10 @@
 			 const char * buf, s32 count);
 #endif
=20
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 static s32 sec_man_proc_dir_entry_read(char *buf, char **start, off_t offs=
et,
 				       s32 len, s32 unused);
+#endif
 #else
 static s32 open_socket(char *name);
 static s32 sec_man_doquery(s32 fd, u8 *request);
@@ -651,6 +653,7 @@
=20
=20
 #ifdef __KERNEL__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 s32 sec_man_proc_dir_entry_read(char *buf, char **start, off_t offset,
 				s32 len, s32 unused)
 {
@@ -660,6 +663,7 @@
 	return sec_man_read(NULL, NULL, buf, len);
 #endif
 }
+#endif
=20
 #ifdef USE_NEW_PROC
 ssize_t sec_man_read(struct file * file, char * buf, size_t count,
@@ -705,7 +709,7 @@
=20=09
 	/* Verify that I read at least the number of byte I am waiting */
 	if (count < sizeof (*sec_hdl))
-		D_ERR(__FUNCTION__ ": Only %d bytes were wroten in proc file instead of =
%d", count, sizeof (*sec_hdl));
+		D_ERR(__FUNCTION__ ": Only %ld bytes were written in proc file instead o=
f %d", count, sizeof (*sec_hdl));
=20=09
 /*	D_XMIT(__FUNCTION__ ": Preparing to send data to sec_con[%d]\n", secb_h=
dl->sec_con_id); */
         if (sec_hdl->originator =3D=3D BT_SEC_MAN) /* o.k. new request */