summaryrefslogtreecommitdiffstats
path: root/hcid/main.c
diff options
context:
space:
mode:
authorCidorvan Leite <cidorvan.leite@openbossa.org>2008-03-31 20:09:27 +0000
committerCidorvan Leite <cidorvan.leite@openbossa.org>2008-03-31 20:09:27 +0000
commit2fc88679b39c0d5db43973d1a3cfee7475c67538 (patch)
tree4c540568ca8f9243747145f7f1fa55012a42dd36 /hcid/main.c
parent40d6167dd9cec68fc24b331692a8f7f3ec63f95a (diff)
Removed SDP conditional initialization
Diffstat (limited to 'hcid/main.c')
-rw-r--r--hcid/main.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/hcid/main.c b/hcid/main.c
index a18d7a32..d9bd51de 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -770,7 +770,7 @@ int main(int argc, char *argv[])
struct sigaction sa;
GIOChannel *ctl_io, *child_io;
uint16_t mtu = 0;
- int opt, daemonize = 1, debug = 0, sdp = 0, experimental = 0;
+ int opt, daemonize = 1, debug = 0, experimental = 0;
/* Default HCId settings */
memset(&hcid, 0, sizeof(hcid));
@@ -788,7 +788,7 @@ int main(int argc, char *argv[])
init_defaults();
- while ((opt = getopt(argc, argv, "ndsm:xf:")) != EOF) {
+ while ((opt = getopt(argc, argv, "ndm:xf:")) != EOF) {
switch (opt) {
case 'n':
daemonize = 0;
@@ -798,10 +798,6 @@ int main(int argc, char *argv[])
debug = 1;
break;
- case 's':
- sdp = 1;
- break;
-
case 'm':
mtu = atoi(optarg);
break;
@@ -915,11 +911,8 @@ int main(int argc, char *argv[])
/* Initialize already connected devices */
init_all_devices(hcid.sock);
- if (sdp) {
- set_sdp_server_enable();
- start_sdp_server(mtu, hcid.deviceid, SDP_SERVER_COMPAT);
- set_service_classes_callback(update_service_classes);
- }
+ start_sdp_server(mtu, hcid.deviceid, SDP_SERVER_COMPAT);
+ set_service_classes_callback(update_service_classes);
notify_init();
@@ -936,8 +929,7 @@ int main(int argc, char *argv[])
plugin_cleanup();
- if (sdp)
- stop_sdp_server();
+ stop_sdp_server();
free_device_opts();