From 539120ca33fc731b30b2fe25e59c69589ab87cc6 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Wed, 31 Mar 2010 18:09:51 -0300 Subject: [PATCH] obexd: all the drivers structs can be declared static --- obexd/plugins/filesystem.c | 6 +++--- obexd/plugins/ftp.c | 4 ++-- obexd/plugins/opp.c | 2 +- obexd/plugins/pbap.c | 8 ++++---- obexd/plugins/syncevolution.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c index 75c1c30f1..873dcedcd 100644 --- a/obexd/plugins/filesystem.c +++ b/obexd/plugins/filesystem.c @@ -480,7 +480,7 @@ static int capability_close(gpointer object) return 0; } -struct obex_mime_type_driver file = { +static struct obex_mime_type_driver file = { .open = filesystem_open, .close = filesystem_close, .read = filesystem_read, @@ -488,7 +488,7 @@ struct obex_mime_type_driver file = { .remove = remove, }; -struct obex_mime_type_driver capability = { +static struct obex_mime_type_driver capability = { .target = FTP_TARGET, .mimetype = "x-obex/capability", .open = capability_open, @@ -496,7 +496,7 @@ struct obex_mime_type_driver capability = { .read = capability_read, }; -struct obex_mime_type_driver folder = { +static struct obex_mime_type_driver folder = { .target = FTP_TARGET, .mimetype = "x-obex/folder-listing", .open = folder_open, diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c index 5dfdb53db..0a1c6f818 100644 --- a/obexd/plugins/ftp.c +++ b/obexd/plugins/ftp.c @@ -377,7 +377,7 @@ static void ftp_disconnect(struct obex_session *os, gpointer user_data) g_free(ftp); } -struct obex_service_driver pcsuite = { +static struct obex_service_driver pcsuite = { .name = "Nokia OBEX PC Suite Services", .service = OBEX_PCSUITE, .channel = PCSUITE_CHANNEL, @@ -394,7 +394,7 @@ struct obex_service_driver pcsuite = { .disconnect = ftp_disconnect }; -struct obex_service_driver ftp = { +static struct obex_service_driver ftp = { .name = "File Transfer server", .service = OBEX_FTP, .channel = FTP_CHANNEL, diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c index 4a29e08bf..30b7560cd 100644 --- a/obexd/plugins/opp.c +++ b/obexd/plugins/opp.c @@ -196,7 +196,7 @@ static void opp_reset(struct obex_session *os, gpointer user_data) manager_emit_transfer_completed(os); } -struct obex_service_driver driver = { +static struct obex_service_driver driver = { .name = "Object Push server", .service = OBEX_OPP, .channel = OPP_CHANNEL, diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c index 339caef04..544aac725 100644 --- a/obexd/plugins/pbap.c +++ b/obexd/plugins/pbap.c @@ -351,7 +351,7 @@ static gint pbap_chkput(struct obex_session *os, return -EINVAL; } -struct obex_service_driver pbap = { +static struct obex_service_driver pbap = { .name = "Phonebook Access server", .service = OBEX_PBAP, .channel = PBAP_CHANNEL, @@ -427,7 +427,7 @@ static int vobject_close(gpointer object) return 0; } -struct obex_mime_type_driver mime_pull = { +static struct obex_mime_type_driver mime_pull = { .target = PBAP_TARGET, .mimetype = "x-bt/phonebook", .open = vobject_open, @@ -435,7 +435,7 @@ struct obex_mime_type_driver mime_pull = { .read = vobject_read, }; -struct obex_mime_type_driver mime_list = { +static struct obex_mime_type_driver mime_list = { .target = PBAP_TARGET, .mimetype = "x-bt/vcard-listing", .open = vobject_open, @@ -443,7 +443,7 @@ struct obex_mime_type_driver mime_list = { .read = vobject_read, }; -struct obex_mime_type_driver mime_vcard = { +static struct obex_mime_type_driver mime_vcard = { .target = PBAP_TARGET, .mimetype = "x-bt/vcard", .open = vobject_open, diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c index f3ebf9d1e..23549914b 100644 --- a/obexd/plugins/syncevolution.c +++ b/obexd/plugins/syncevolution.c @@ -440,7 +440,7 @@ static ssize_t synce_write(gpointer object, const void *buf, size_t count) return -EAGAIN; } -struct obex_mime_type_driver synce_driver = { +static struct obex_mime_type_driver synce_driver = { .target = SYNCML_TARGET, .open = synce_open, .close = synce_close, @@ -448,7 +448,7 @@ struct obex_mime_type_driver synce_driver = { .write = synce_write, }; -struct obex_service_driver synce = { +static struct obex_service_driver synce = { .name = "OBEX server for SyncML, using SyncEvolution", .service = OBEX_SYNCEVOLUTION, .channel = SYNCEVOLUTION_CHANNEL, -- 2.47.3