diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2013-04-18 09:07:24 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2013-04-18 14:17:01 +0300 |
| commit | 1d1f9c7ccabdcaa74cdb5c4c791fc2bdb32ec42b (patch) | |
| tree | 118acd7e57070e185764c1c4823283bc20b183b4 | |
| parent | 522a55abc20d675350addb6de4d627f52bc9ed23 (diff) | |
| download | connman-1d1f9c7ccabdcaa74cdb5c4c791fc2bdb32ec42b.tar.gz connman-1d1f9c7ccabdcaa74cdb5c4c791fc2bdb32ec42b.tar.bz2 connman-1d1f9c7ccabdcaa74cdb5c4c791fc2bdb32ec42b.zip | |
session: Change to "func_t" postfix to callback typedef
Streamline the callback typedefs with the rest of the code.
| -rw-r--r-- | include/session.h | 4 | ||||
| -rw-r--r-- | plugins/session_policy_local.c | 6 | ||||
| -rw-r--r-- | src/session.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/session.h b/include/session.h index 7c8b0d4c..e77bd562 100644 --- 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 2f503d1a..7125f356 100644 --- 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 d06edc81..5a6065f6 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_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) |