CVS: The file 'apps/bluetooth/sdp_server/sdp_server.c' has been modified.

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

The following file was modified in apps/bluetooth/sdp_server:

Name            Old version     New version     Comment
----            -----------     -----------     -------
sdp_server.c    1.17            1.18=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Use the defines for the error messages.


The diff of the modified file(s):

--- sdp_server.c	2001/02/27 15:32:14	1.17
+++ sdp_server.c	2001/03/25 09:50:02	1.18
@@ -715,7 +715,7 @@
   {
     fprintf(stderr, FNC"Didn't find service class name for RecordHandle 0x=
%08x\n", record_handle);
=20
-    set_err(2);
+    set_err(SDP_INVALID_SERVICE_RECORD_HANDLE);
     D_MEM("<--- free%d 0x%08x\n",malloc_dbg--, (int) search_struct.attribu=
te_name);
     free(search_struct.attribute_name);
     return NULL;
@@ -1340,8 +1340,8 @@
     }
     else
     {
-      int err;
-      err =3D get_err();
+      int err =3D get_err();
+
       if (err)
       {
 	send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, err);
@@ -1594,7 +1594,7 @@
   int send_len;
=20=20=20
   if (!cont_state_buf) {
-    send_error_rsp(sdp_con_id, trans_id, 5);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_CONTINUATION_STATE);
   }
   else
   {
@@ -1638,7 +1638,7 @@
=20
       /* FIXME: Have to implement this too... */
=20
-      send_error_rsp(sdp_con_id, trans_id, 1);
+      send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_SDP_VERSION);
     }
   }
 }
@@ -1651,7 +1651,7 @@
   int send_len;
=20=20=20
   if (!cont_state_buf) {
-    send_error_rsp(sdp_con_id, trans_id, 5);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_CONTINUATION_STATE);
   }
   else
   {
@@ -1691,7 +1691,7 @@
=20
       /* FIXME: Have to implement this too... */
=20
-      send_error_rsp(sdp_con_id, trans_id, 1);
+      send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_SDP_VERSION);
     }
   }
 }