From b248e814f2e3f7ef5638e7868752c2d0b5a7438b Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 7 May 2012 07:14:30 -0700 Subject: [PATCH] obexd: Fix codying style Fix lines that are over 80 columns --- obexd/client/transfer.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index d79623929..96ac05f63 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -152,19 +152,20 @@ static void abort_complete(GObex *obex, GError *err, gpointer user_data) dbus_message_unref(transfer->msg); transfer->msg = NULL; - if (callback) { - if (err) { - callback->func(transfer, transfer->transferred, err, + if (callback == NULL) + return; + + if (err) { + callback->func(transfer, transfer->transferred, err, callback->data); - } else { - GError *abort_err; + } else { + GError *abort_err; - abort_err = g_error_new(OBC_TRANSFER_ERROR, -ECANCELED, "%s", + abort_err = g_error_new(OBC_TRANSFER_ERROR, -ECANCELED, "%s", "Transfer cancelled by user"); - callback->func(transfer, transfer->transferred, abort_err, - callback->data); - g_error_free(abort_err); - } + callback->func(transfer, transfer->transferred, abort_err, + callback->data); + g_error_free(abort_err); } } @@ -243,13 +244,13 @@ static void obc_transfer_free(struct obc_transfer *transfer) } static struct obc_transfer *obc_transfer_register(DBusConnection *conn, - const char *agent, - guint8 op, - const char *filename, - const char *name, - const char *type, - struct obc_transfer_params *params, - GError **err) + const char *agent, + guint8 op, + const char *filename, + const char *name, + const char *type, + struct obc_transfer_params *params, + GError **err) { struct obc_transfer *transfer; -- 2.47.3