Return-Path: From: Mikel Astiz To: linux-bluetooth@vger.kernel.org Cc: Mikel Astiz Subject: [RFC obexd v1 2/2] client: Use new D-Bus helper function Date: Thu, 3 May 2012 14:41:48 +0200 Message-Id: <1336048908-8685-3-git-send-email-mikel.astiz.oss@gmail.com> In-Reply-To: <1336048908-8685-1-git-send-email-mikel.astiz.oss@gmail.com> References: <1336048908-8685-1-git-send-email-mikel.astiz.oss@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Mikel Astiz This refactoring makes use of the recently introduced helper function to remove boilerplate error-handling code. --- client/ftp.c | 85 +++++++++++++++-------------------------------------- client/manager.c | 12 ++----- client/map.c | 31 ++++++-------------- client/pbap.c | 29 +++++------------- client/sync.c | 20 ++++--------- 5 files changed, 51 insertions(+), 126 deletions(-) diff --git a/client/ftp.c b/client/ftp.c index 86c2a3c..1c854ef 100644 --- a/client/ftp.c +++ b/client/ftp.c @@ -81,14 +81,9 @@ static DBusMessage *change_folder(DBusConnection *connection, "org.openobex.Error.InvalidArguments", NULL); obc_session_setpath(session, folder, async_cb, message, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -239,14 +234,9 @@ static DBusMessage *create_folder(DBusConnection *connection, "org.openobex.Error.InvalidArguments", NULL); obc_session_mkdir(session, folder, async_cb, message, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -262,13 +252,9 @@ static DBusMessage *list_folder(DBusConnection *connection, obc_session_get(session, "x-obex/folder-listing", NULL, NULL, NULL, 0, list_folder_callback, message, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -292,13 +278,9 @@ static DBusMessage *get_file(DBusConnection *connection, obc_session_get(session, NULL, source_file, target_file, NULL, 0, get_file_callback, message, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -322,13 +304,9 @@ static DBusMessage *put_file(DBusConnection *connection, "Invalid arguments in method call"); obc_session_send(session, sourcefile, targetfile, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); return dbus_message_new_method_return(message); } @@ -349,14 +327,9 @@ static DBusMessage *copy_file(DBusConnection *connection, "org.openobex.Error.InvalidArguments", NULL); obc_session_copy(session, filename, destname, async_cb, message, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -379,14 +352,9 @@ static DBusMessage *move_file(DBusConnection *connection, "org.openobex.Error.InvalidArguments", NULL); obc_session_move(session, filename, destname, async_cb, message, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); @@ -408,14 +376,9 @@ static DBusMessage *delete(DBusConnection *connection, "org.openobex.Error.InvalidArguments", NULL); obc_session_delete(session, file, async_cb, message, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); dbus_message_ref(message); diff --git a/client/manager.c b/client/manager.c index a46519f..11a6a5c 100644 --- a/client/manager.c +++ b/client/manager.c @@ -291,10 +291,8 @@ static void pull_obc_session_callback(struct obc_session *session, obc_session_pull(session, "text/x-vcard", data->filename, pull_complete_callback, data, &gerr); if (gerr != NULL) { - reply = g_dbus_create_error(data->message, - "org.openobex.Error.Failed", - "%s", gerr->message); - g_error_free(gerr); + reply = g_dbus_steal_from_gerror(data->message, + "org.openobex.Error.Failed", &gerr); goto fail; } @@ -510,10 +508,8 @@ static void capability_obc_session_callback(struct obc_session *session, obc_session_pull(session, "x-obex/capability", NULL, capabilities_complete_callback, data, &gerr); if (gerr != NULL) { - reply = g_dbus_create_error(data->message, - "org.openobex.Error.Failed", - "%s", gerr->message); - g_error_free(gerr); + reply = g_dbus_steal_from_gerror(data->message, + "org.openobex.Error.Failed", &gerr); goto fail; } diff --git a/client/map.c b/client/map.c index eb06834..793e12c 100644 --- a/client/map.c +++ b/client/map.c @@ -82,14 +82,9 @@ static DBusMessage *map_setpath(DBusConnection *connection, NULL); obc_session_setpath(map->session, folder, simple_cb, map, &err); - if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); map->msg = dbus_message_ref(message); @@ -140,13 +135,9 @@ static DBusMessage *map_get_folder_listing(DBusConnection *connection, obc_session_get(map->session, "x-obex/folder-listing", NULL, NULL, NULL, 0, buffer_cb, map, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); map->msg = dbus_message_ref(message); @@ -172,13 +163,9 @@ static DBusMessage *map_get_message_listing(DBusConnection *connection, obc_session_get(map->session, "x-bt/MAP-msg-listing", folder, NULL, NULL, 0, buffer_cb, map, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); map->msg = dbus_message_ref(message); diff --git a/client/pbap.c b/client/pbap.c index b178aff..5cc0faf 100644 --- a/client/pbap.c +++ b/client/pbap.c @@ -496,12 +496,9 @@ static DBusMessage *pull_phonebook(struct pbap_data *pbap, (guint8 *) &apparam, sizeof(apparam), func, request, &err); if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); pending_request_free(request); - return reply; + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); } return NULL; @@ -562,13 +559,9 @@ static DBusMessage *pull_vcard_listing(struct pbap_data *pbap, pull_vcard_listing_callback, request, &err); g_free(apparam); if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); pending_request_free(request); - return reply; - + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); } return NULL; @@ -718,13 +711,10 @@ static DBusMessage *pbap_select(DBusConnection *connection, obc_session_setpath(pbap->session, path, pbap_setpath_cb, request, &err); if (err != NULL) { - DBusMessage *reply; - reply = g_dbus_create_error(message, ERROR_INF ".Failed", - "%s", err->message); - g_error_free(err); g_free(path); pending_request_free(request); - return reply; + return g_dbus_steal_from_gerror(message, + ERROR_INF ".Failed", &err); } g_free(pbap->path); @@ -786,12 +776,9 @@ static DBusMessage *pbap_pull_vcard(DBusConnection *connection, (guint8 *)&apparam, sizeof(apparam), pull_phonebook_callback, request, &err); if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - "org.openobex.Error.Failed", - "%s", err->message); - g_error_free(err); pending_request_free(request); - return reply; + return g_dbus_steal_from_gerror(message, + "org.openobex.Error.Failed", &err); } return NULL; diff --git a/client/sync.c b/client/sync.c index c0b3800..4b80d34 100644 --- a/client/sync.c +++ b/client/sync.c @@ -141,13 +141,9 @@ static DBusMessage *sync_getphonebook(DBusConnection *connection, NULL, NULL, 0, sync_getphonebook_callback, sync, &err); - if (err != 0) { - DBusMessage *reply = g_dbus_create_error(message, - ERROR_INF ".Failed", - err->message); - g_error_free(err); - return reply; - } + if (err != 0) + return g_dbus_steal_from_gerror(message, + ERROR_INF ".Failed", &err); sync->msg = dbus_message_ref(message); @@ -173,13 +169,9 @@ static DBusMessage *sync_putphonebook(DBusConnection *connection, obc_session_put(sync->session, buf, strlen(buf), sync->phonebook_path, &err); - if (err != NULL) { - DBusMessage *reply = g_dbus_create_error(message, - ERROR_INF ".Failed", - err->message); - g_error_free(err); - return reply; - } + if (err != NULL) + return g_dbus_steal_from_gerror(message, + ERROR_INF ".Failed", &err); return dbus_message_new_method_return(message); } -- 1.7.7.6