[PATCH v1 13/20] session: Add "_t" postfix to callback typedef

[Daniel Wagner]

From: Daniel Wagner <daniel.wag...@bmw-carit.de>

Be more consistent with the rest. Also shorten the a bit to verbose
name of the callback function.
---
 include/session.h              |  8 ++++----
 plugins/session_policy_local.c |  8 ++++----
 src/session.c                  | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/session.h b/include/session.h
index cf32e48..62c303c 100644
--- a/include/session.h
+++ b/include/session.h
@@ -59,16 +59,16 @@ struct connman_session_config {
        GSList *allowed_bearers;
 };
 
-typedef int (* connman_session_config_cb) (struct connman_session *session,
+typedef int (* connman_session_config_cb_t) (int error,
+                                       struct connman_session *session,
                                        struct connman_session_config *config,
-                                       void *user_data, int err);
+                                       void *user_data);
 
 struct connman_session_policy {
        const char *name;
        int priority;
        int (*create)(struct connman_session *session,
-                       connman_session_config_cb callback,
-                       void *user_data);
+                       connman_session_config_cb_t cb, void *user_data);
        void (*destroy)(struct connman_session *session);
 };
 
diff --git a/plugins/session_policy_local.c b/plugins/session_policy_local.c
index 55264ed..0ffa512 100644
--- a/plugins/session_policy_local.c
+++ b/plugins/session_policy_local.c
@@ -52,7 +52,7 @@ static GSList *policy_list;
 
 struct create_data {
        struct connman_session *session;
-       connman_session_config_cb callback;
+       connman_session_config_cb_t cb;
        void *user_data;
 };
 
@@ -216,7 +216,7 @@ static void selinux_context_reply(const unsigned char 
*context, void *user_data,
        config = policy->config;
 
 done:
-       (*data->callback)(data->session, config, data->user_data, err);
+       (*data->cb)(err, data->session, config, data->user_data);
 
        g_free(data);
        g_free(ident);
@@ -224,7 +224,7 @@ done:
 }
 
 static int policy_local_create(struct connman_session *session,
-                               connman_session_config_cb callback,
+                               connman_session_config_cb_t cb,
                                void *user_data)
 {
        struct create_data *data;
@@ -236,7 +236,7 @@ static int policy_local_create(struct connman_session 
*session,
        data = g_new0(struct create_data, 1);
 
        data->session = session;
-       data->callback = callback;
+       data->cb = cb;
        data->user_data = user_data;
 
        owner = connman_session_get_owner(session);
diff --git a/src/session.c b/src/session.c
index b7b0a1f..365c71c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -313,7 +313,7 @@ static void cleanup_user_config(struct user_config 
*user_config)
 }
 
 static int create_policy_config(struct connman_session *session,
-                               connman_session_config_cb callback,
+                               connman_session_config_cb_t cb,
                                struct user_config *user_config)
 {
        struct connman_session_config *config;
@@ -326,10 +326,10 @@ static int create_policy_config(struct connman_session 
*session,
                        return -ENOMEM;
                }
 
-               return callback(session, config, user_config, 0);
+               return cb(0, session, config, user_config);
        }
 
-       return (*session->policy->create)(session, callback, user_config);
+       return (*session->policy->create)(session, cb, user_config);
 }
 
 static void probe_policy(struct connman_session_policy *policy)
@@ -1616,9 +1616,9 @@ static const GDBusMethodTable session_methods[] = {
        { },
 };
 
-static int session_create_cb(struct connman_session *session,
+static int session_create_cb(int err, struct connman_session *session,
                                struct connman_session_config *config,
-                               void *user_data, int err)
+                               void *user_data)
 {
        DBusMessage *reply;
        struct user_config *user_config = user_data;
-- 
1.8.1.3.566.gaa39828

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman