CVS: 2 files have been modified in apps/bluetooth/sdp_server.

[Anders J. <and...@us...>]

The following files were modified in apps/bluetooth/sdp_server:

Name          Old version  New version  Tag  Comment
----          -----------  -----------  ---  -------
Makefile      1.13         1.14=20=20=20=20=20=20=20=20=20=20=20=20=20=20
sdp_server.c  1.33         1.34=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Created OpenBT library from common files in experimental.
* Removed experimental, BluetoothPN and btd. Usermode stack will not be=20
  supported from now on.
* Moved applications to utils-directory.
* Removed warnings.



The diff of the modified file(s):

--- Makefile	2002/09/27 12:59:03	1.13
+++ Makefile	2003/11/04 10:59:38	1.14
@@ -22,7 +22,7 @@ SRCS      =3D sdp_server.c sdp_parser.c
=20
 CFLAGS   +=3D -I$(INCDIR) -MMD
 LDFLAGS  +=3D -L$(LIBDIR)
-LDLIBS   +=3D -lxmlparse -lxmltok
+LDLIBS   +=3D -lexpat
=20
 all:	$(PROGS)
=20
--- sdp_server.c	2003/03/29 18:44:56	1.33
+++ sdp_server.c	2003/11/04 10:59:38	1.34
@@ -46,7 +46,7 @@
 #include <syslog.h>
 #include <unistd.h>
=20
-#include <xmlparse.h>
+#include <expat.h>
=20
 #include "sdp_server.h"
 #include "sdp_parser.h"
@@ -812,7 +812,7 @@ get_attribute_list(int fd, unsigned int=20
=20
   if (search_struct.attribute_name =3D=3D NULL)
   {
-    fprintf(stderr, __FUNCTION__ ": Didn't find service attribute id name =
for uuid 0x%04x\n", attr_id_code);
+    fprintf(stderr, "%s: Didn't find service attribute id name for uuid 0x=
%04x\n", __FUNCTION__, attr_id_code);
     return NULL;
   }
=20=20=20
@@ -823,7 +823,7 @@ get_attribute_list(int fd, unsigned int=20
=20=20=20
   if (search_struct.service_class =3D=3D NULL)
   {
-    fprintf(stderr, __FUNCTION__ ": Didn't find service class name for Rec=
ordHandle 0x%08x\n", record_handle);
+    fprintf(stderr, "%s: Didn't find service class name for RecordHandle 0=
x%08x\n", __FUNCTION__, record_handle);
=20
     set_err(SDP_INVALID_SERVICE_RECORD_HANDLE);
     D_MEM("<--- free%d 0x%8p", --malloc_dbg, search_struct.attribute_name);
@@ -1108,7 +1108,7 @@ get_from_xml(int fd, char *tag, char *at
   {=20=20=20=20
     if (set_value !=3D -1)
     {
-      fprintf(stderr, __FUNCTION__ ": Error more than one attribute =3D=3D=
 NULL\n");
+      fprintf(stderr, "%s: Error more than one attribute =3D=3D NULL\n", _=
_FUNCTION__);
       return NULL;
     }
=20
@@ -1120,7 +1120,7 @@ get_from_xml(int fd, char *tag, char *at
   {
     if (set_value !=3D -1)
     {
-      fprintf(stderr, __FUNCTION__ ": Error more than one attribute =3D=3D=
 NULL\n");
+      fprintf(stderr, "%s: Error more than one attribute =3D=3D NULL\n", _=
_FUNCTION__);
       return NULL;
     }
=20
@@ -1630,11 +1630,11 @@ handle_service_search_attr_req(service_s
       }
       if (tmp_ptr)
       {=20=20=20
-        printf(__FUNCTION__ ": Copying %d bytes to rsp_pkt\n", tmp_ptr[1]);
+        printf("%s: Copying %d bytes to rsp_pkt\n", __FUNCTION__,  tmp_ptr=
[1]);
         memcpy(rsp_pkt + rsp_pkt_len + tmp_len, tmp_ptr + 2, tmp_ptr[1]);
         tmp_len +=3D tmp_ptr[1];
=20
-        printf(__FUNCTION__ ": list_len: %d\n", tmp_len);
+        printf("%s: list_len: %d\n", __FUNCTION__, tmp_len);
=20
         D_MEM("<--- free%d tmp_ptr 0x%8p", --malloc_dbg, tmp_ptr);
         free(tmp_ptr);