diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2011-11-02 15:09:50 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2011-11-03 10:28:38 +0200 |
commit | bb3eb3c1addbbadc8a261f2a86c5ae085c0d383d (patch) | |
tree | 2f563b700242d4f63db3fd545be710ffe78950a6 /src/server.c | |
parent | e4e0442e73e9e98a5012c03385742cf6cb58f15b (diff) | |
download | obexd-bb3eb3c1addbbadc8a261f2a86c5ae085c0d383d.tar.gz |
Remove options per server
Options are general so it is pointless to copy them to each server.
Diffstat (limited to 'src/server.c')
-rw-r--r-- | src/server.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/server.c b/src/server.c index 44a501c..dc1ad6d 100644 --- a/src/server.c +++ b/src/server.c @@ -47,16 +47,7 @@ static GSList *servers = NULL; -static void obex_server_free(struct obex_server *server) -{ - g_free(server->folder); - g_free(server->capability); - g_free(server); -} - -int obex_server_init(uint16_t service, const char *folder, - gboolean secure, gboolean auto_accept, - gboolean symlinks, const char *capability) +int obex_server_init(uint16_t service, gboolean secure) { GSList *drivers; GSList *transports; @@ -86,17 +77,13 @@ int obex_server_init(uint16_t service, const char *folder, server = g_new0(struct obex_server, 1); server->transport = transport; server->drivers = drivers; - server->folder = g_strdup(folder); - server->auto_accept = auto_accept; - server->symlinks = symlinks; - server->capability = g_strdup(capability); server->secure = secure; server->transport_data = transport->start(server, &err); if (server->transport_data == NULL) { DBG("Unable to start %s transport: %s (%d)", transport->name, strerror(err), err); - obex_server_free(server); + g_free(server); continue; } @@ -114,7 +101,7 @@ void obex_server_exit(void) struct obex_server *server = l->data; server->transport->stop(server->transport_data); - obex_server_free(server); + g_free(server); } g_slist_free(servers); |