diff options
| author |  Martin Szulecki | 2010-03-16 03:10:56 +0100 |
|---|---|---|
| committer | Martin Szulecki | 2010-03-16 03:10:56 +0100 |
| commit | 3e0c5021100c879ff7d0776d4c7bb4f0ec88e0d7 (patch) | |
| tree | 1b09b2203ab168fb4f35ba3a69907ef0f33394ef | |
| parent | 704b112c38a68f021f8e98cafaf1a60257ea8c80 (diff) | |
| download | libimobiledevice-3e0c5021100c879ff7d0776d4c7bb4f0ec88e0d7.tar.gz libimobiledevice-3e0c5021100c879ff7d0776d4c7bb4f0ec88e0d7.tar.bz2 | |
Unify NP callback userdata parameter to user_data for consistency
| -rw-r--r-- | include/libimobiledevice/notification_proxy.h | 3 | ||||
| -rw-r--r-- | src/notification_proxy.c | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/libimobiledevice/notification_proxy.h b/include/libimobiledevice/notification_proxy.h index fa69088..74b6b37 100644 --- a/include/libimobiledevice/notification_proxy.h +++ b/include/libimobiledevice/notification_proxy.h @@ -71,7 +71,8 @@ typedef int16_t np_error_t; typedef struct np_client_private np_client_private; typedef np_client_private *np_client_t; /**< The client handle. */ -typedef void (*np_notify_cb_t) (const char *notification, void *userdata); +/** Reports which notification was received. */ +typedef void (*np_notify_cb_t) (const char *notification, void *user_data); /* Interface */ np_error_t np_client_new(idevice_t device, uint16_t port, np_client_t *client); diff --git a/src/notification_proxy.c b/src/notification_proxy.c index b82378a..7d84e30 100644 --- a/src/notification_proxy.c +++ b/src/notification_proxy.c @@ -33,7 +33,7 @@ struct np_thread { np_client_t client; np_notify_cb_t cbfunc; - void *userdata; + void *user_data; }; /** @@ -334,7 +334,7 @@ gpointer np_notifier( gpointer arg ) while (npt->client->parent) { np_get_notification(npt->client, ¬ification); if (notification) { - npt->cbfunc(notification, npt->userdata); + npt->cbfunc(notification, npt->user_data); free(notification); notification = NULL; } @@ -356,8 +356,8 @@ gpointer np_notifier( gpointer arg ) * @param client the NP client * @param notify_cb pointer to a callback function or NULL to de-register a * previously set callback function. - * @param userdata Pointer that will be passed to the callback function as - * userdata. If notify_cb is NULL, this parameter is ignored. + * @param user_data Pointer that will be passed to the callback function as + * user data. If notify_cb is NULL, this parameter is ignored. * * @note Only one callback function can be registered at the same time; * any previously set callback function will be removed automatically. @@ -366,7 +366,7 @@ gpointer np_notifier( gpointer arg ) * NP_E_INVALID_ARG when client is NULL, or NP_E_UNKNOWN_ERROR when * the callback thread could no be created. */ -np_error_t np_set_notify_callback( np_client_t client, np_notify_cb_t notify_cb, void *userdata ) +np_error_t np_set_notify_callback( np_client_t client, np_notify_cb_t notify_cb, void *user_data ) { if (!client) return NP_E_INVALID_ARG; @@ -388,7 +388,7 @@ np_error_t np_set_notify_callback( np_client_t client, np_notify_cb_t notify_cb, if (npt) { npt->client = client; npt->cbfunc = notify_cb; - npt->userdata = userdata; + npt->user_data = user_data; client->notifier = g_thread_create(np_notifier, npt, TRUE, NULL); if (client->notifier) { |