Changeset 171

Timestamp:

06/26/07 16:28:24 (17 months ago)

Author:

zany

Message:

return instead of exit

Files:

• trunk/obexftp/bt_discovery.c (modified) (8 diffs)

trunk/obexftp/bt_discovery.c

@@ -47 +47 @@
   else
       dev_id = hci_get_route(NULL);
-  DEBUG(1, "%s: Scanning ...\n", __func__);
+  DEBUG(2, "%s: Scanning ...\n", __func__);
   flags = IREQ_CACHE_FLUSH; /* only show devices currently in range */
   num_rsp = hci_inquiry(dev_id, length, num_rsp, NULL, &info, flags);
@@ -54 +54 @@
     {
       perror("Inquiry failed.");
-      exit(1);
+      return NULL;
     }
 
@@ -62 +62 @@
       perror("HCI device open failed");
       free(info);
-      exit(1);
+      return NULL;
     }
   
@@ -76 +76 @@
         }
 
-      DEBUG(1, "%s: Found\t%s\t%s\n", __func__, batostr(&bdswap), name);
+      DEBUG(2, "%s: Found\t%s\t%s\n", __func__, batostr(&bdswap), name);
       res[i] = strdup(batostr(&bdswap));
   }
@@ -101 +101 @@
       perror("SDP service search");
       sdp_close(sess);
-      exit(1);
+      return -1;
     }
 
@@ -153 +153 @@
     {
       perror("Failed to connect to SDP server");
-      exit(1);
+      return -1;
     }
 //  baswap(&bdswap, &bdaddr);
@@ -188 +188 @@
 #warning "no bluetooth scan available"
 #include "client.h"
-char **obexftp_discover_bt()
+char **obexftp_discover_bt_src(const char *UNUSED(src))
 {
     return NULL;
 }
-int obexftp_browse_bt(const char *UNUSED(addr), int UNUSED(svclass))
-{
-    return 0;
+int obexftp_browse_bt_src(const char *UNUSED(src), const char *UNUSED(addr), int UNUSED(svclass))
+{
+    return -1;
 }
 
@@ -202 +202 @@
 #warning "no bluetooth discovery available"
 #include "client.h"
-char **obexftp_discover_bt()
+char **obexftp_discover_bt_src(const char *src)
 {
     return NULL;
 }
-int obexftp_browse_bt(const char *UNUSED(addr), int UNUSED(svclass))
-{
-    return 0;
+int obexftp_browse_bt_src(const char *UNUSED(src), const char *UNUSED(addr), int UNUSED(svclass))
+{
+    return -1;
 }