diff options
-rw-r--r-- | include/libimobiledevice/notification_proxy.h | 4 | ||||
-rw-r--r-- | src/installation_proxy.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/libimobiledevice/notification_proxy.h b/include/libimobiledevice/notification_proxy.h index 872692c..4eccf20 100644 --- a/include/libimobiledevice/notification_proxy.h +++ b/include/libimobiledevice/notification_proxy.h | |||
@@ -183,7 +183,7 @@ np_error_t np_observe_notifications(np_client_t client, const char **notificatio | |||
183 | * @param client the NP client | 183 | * @param client the NP client |
184 | * @param notify_cb pointer to a callback function or NULL to de-register a | 184 | * @param notify_cb pointer to a callback function or NULL to de-register a |
185 | * previously set callback function. | 185 | * previously set callback function. |
186 | * @param userdata Pointer that will be passed to the callback function as | 186 | * @param user_data Pointer that will be passed to the callback function as |
187 | * user data. If notify_cb is NULL, this parameter is ignored. | 187 | * user data. If notify_cb is NULL, this parameter is ignored. |
188 | * | 188 | * |
189 | * @note Only one callback function can be registered at the same time; | 189 | * @note Only one callback function can be registered at the same time; |
@@ -193,7 +193,7 @@ np_error_t np_observe_notifications(np_client_t client, const char **notificatio | |||
193 | * NP_E_INVALID_ARG when client is NULL, or NP_E_UNKNOWN_ERROR when | 193 | * NP_E_INVALID_ARG when client is NULL, or NP_E_UNKNOWN_ERROR when |
194 | * the callback thread could no be created. | 194 | * the callback thread could no be created. |
195 | */ | 195 | */ |
196 | np_error_t np_set_notify_callback(np_client_t client, np_notify_cb_t notify_cb, void *userdata); | 196 | np_error_t np_set_notify_callback(np_client_t client, np_notify_cb_t notify_cb, void *user_data); |
197 | 197 | ||
198 | #ifdef __cplusplus | 198 | #ifdef __cplusplus |
199 | } | 199 | } |
diff --git a/src/installation_proxy.c b/src/installation_proxy.c index ebf2d03..eedddc7 100644 --- a/src/installation_proxy.c +++ b/src/installation_proxy.c | |||
@@ -282,9 +282,6 @@ LIBIMOBILEDEVICE_API instproxy_error_t instproxy_client_free(instproxy_client_t | |||
282 | * | 282 | * |
283 | * @param client The connected installation_proxy client. | 283 | * @param client The connected installation_proxy client. |
284 | * @param command The command to execute. Required. | 284 | * @param command The command to execute. Required. |
285 | * @param client_options The client options to use, as PLIST_DICT, or NULL. | ||
286 | * @param appid The ApplicationIdentifier to add or NULL if not required. | ||
287 | * @param package_path The installation package path or NULL if not required. | ||
288 | * | 285 | * |
289 | * @return INSTPROXY_E_SUCCESS on success or an INSTPROXY_E_* error value if | 286 | * @return INSTPROXY_E_SUCCESS on success or an INSTPROXY_E_* error value if |
290 | * an error occurred. | 287 | * an error occurred. |
@@ -986,9 +983,9 @@ LIBIMOBILEDEVICE_API void instproxy_client_options_free(plist_t client_options) | |||
986 | } | 983 | } |
987 | } | 984 | } |
988 | 985 | ||
989 | LIBIMOBILEDEVICE_API instproxy_error_t instproxy_client_get_path_for_bundle_identifier(instproxy_client_t client, const char* appid, char** path) | 986 | LIBIMOBILEDEVICE_API instproxy_error_t instproxy_client_get_path_for_bundle_identifier(instproxy_client_t client, const char* bundle_id, char** path) |
990 | { | 987 | { |
991 | if (!client || !client->parent || !appid) | 988 | if (!client || !client->parent || !bundle_id) |
992 | return INSTPROXY_E_INVALID_ARG; | 989 | return INSTPROXY_E_INVALID_ARG; |
993 | 990 | ||
994 | plist_t apps = NULL; | 991 | plist_t apps = NULL; |
@@ -1001,7 +998,7 @@ LIBIMOBILEDEVICE_API instproxy_error_t instproxy_client_get_path_for_bundle_iden | |||
1001 | instproxy_client_options_set_return_attributes(client_opts, "CFBundleIdentifier", "CFBundleExecutable", "Path", NULL); | 998 | instproxy_client_options_set_return_attributes(client_opts, "CFBundleIdentifier", "CFBundleExecutable", "Path", NULL); |
1002 | 999 | ||
1003 | // only query for specific appid | 1000 | // only query for specific appid |
1004 | const char* appids[] = {appid, NULL}; | 1001 | const char* appids[] = {bundle_id, NULL}; |
1005 | 1002 | ||
1006 | // query device for list of apps | 1003 | // query device for list of apps |
1007 | instproxy_error_t ierr = instproxy_lookup(client, appids, client_opts, &apps); | 1004 | instproxy_error_t ierr = instproxy_lookup(client, appids, client_opts, &apps); |
@@ -1012,7 +1009,7 @@ LIBIMOBILEDEVICE_API instproxy_error_t instproxy_client_get_path_for_bundle_iden | |||
1012 | return ierr; | 1009 | return ierr; |
1013 | } | 1010 | } |
1014 | 1011 | ||
1015 | plist_t app_found = plist_access_path(apps, 1, appid); | 1012 | plist_t app_found = plist_access_path(apps, 1, bundle_id); |
1016 | if (!app_found) { | 1013 | if (!app_found) { |
1017 | if (apps) | 1014 | if (apps) |
1018 | plist_free(apps); | 1015 | plist_free(apps); |