session: Change to "func_t" postfix to callback typedef

Streamline the callback typedefs with the rest of the code.

diff --git a/include/session.h b/include/session.h
index 7c8b0d4..e77bd56 100644 (file)
--- a/include/session.h
+++ b/include/session.h
@@ -76,7 +76,7 @@ struct connman_session_config {
        GSList *allowed_bearers;
 };
 
-typedef int (* connman_session_config_cb) (struct connman_session *session,
+typedef int (* connman_session_config_func_t) (struct connman_session *session,
                                        struct connman_session_config *config,
                                        void *user_data, int err);
 
@@ -84,7 +84,7 @@ struct connman_session_policy {
        const char *name;
        int priority;
        int (*create)(struct connman_session *session,
-                       connman_session_config_cb callback,
+                       connman_session_config_func_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 2f503d1..7125f35 100644 (file)
--- a/plugins/session_policy_local.c
+++ b/plugins/session_policy_local.c
@@ -163,7 +163,7 @@ static void selinux_context_reply(const unsigned char *context, void *user_data,
                                        int err)
 {
        struct cb_data *cbd = user_data;
-       connman_session_config_cb cb = cbd->cb;
+       connman_session_config_func_t cb = cbd->cb;
        struct create_data *data = cbd->data;
        struct policy_data *policy;
        struct connman_session_config *config = NULL;
@@ -204,10 +204,10 @@ done:
 }
 
 static int policy_local_create(struct connman_session *session,
-                               connman_session_config_cb callback,
+                               connman_session_config_func_t cb,
                                void *user_data)
 {
-       struct cb_data *cbd = cb_data_new(callback, user_data);
+       struct cb_data *cbd = cb_data_new(cb, user_data);
        struct create_data *data;
        const char *owner;
        int err;

diff --git a/src/session.c b/src/session.c
index d06edc8..5a6065f 100644 (file)
--- 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_func_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(session, config, user_config, 0);
        }
 
-       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)