summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2013-11-04 23:19:37 +0100
committerGravatar Martin Szulecki2013-11-04 23:19:37 +0100
commit49f549c9dccdb54a4f27931f8069baa73d1d1bf8 (patch)
tree25dde4b485b6b8b83c99719e721c179acbfc6a6a
parent2eaa56006670275faf691ae26679e14dde77e7ed (diff)
downloadlibimobiledevice-49f549c9dccdb54a4f27931f8069baa73d1d1bf8.tar.gz
libimobiledevice-49f549c9dccdb54a4f27931f8069baa73d1d1bf8.tar.bz2
Convert stray spaces to corresponding tabs
-rw-r--r--src/afc.c16
-rw-r--r--src/house_arrest.c52
-rw-r--r--src/idevice.c48
-rw-r--r--src/lockdown.c1
-rw-r--r--src/misagent.c50
-rw-r--r--src/sbservices.c26
-rw-r--r--tools/idevicescreenshot.c22
7 files changed, 108 insertions, 107 deletions
diff --git a/src/afc.c b/src/afc.c
index e3da184..bdfa30e 100644
--- a/src/afc.c
+++ b/src/afc.c
@@ -1371,15 +1371,15 @@ afc_error_t afc_set_file_time(afc_client_t client, const char *path, uint64_t mt
1371 1371
1372afc_error_t afc_dictionary_free(char **dictionary) 1372afc_error_t afc_dictionary_free(char **dictionary)
1373{ 1373{
1374 int i = 0; 1374 int i = 0;
1375 1375
1376 if (!dictionary) 1376 if (!dictionary)
1377 return AFC_E_INVALID_ARG; 1377 return AFC_E_INVALID_ARG;
1378 1378
1379 for (i = 0; dictionary[i]; i++) { 1379 for (i = 0; dictionary[i]; i++) {
1380 free(dictionary[i]); 1380 free(dictionary[i]);
1381 } 1381 }
1382 free(dictionary); 1382 free(dictionary);
1383 1383
1384 return AFC_E_SUCCESS; 1384 return AFC_E_SUCCESS;
1385} 1385}
diff --git a/src/house_arrest.c b/src/house_arrest.c
index f4314e7..5a23aff 100644
--- a/src/house_arrest.c
+++ b/src/house_arrest.c
@@ -40,19 +40,19 @@
40 */ 40 */
41static house_arrest_error_t house_arrest_error(property_list_service_error_t err) 41static house_arrest_error_t house_arrest_error(property_list_service_error_t err)
42{ 42{
43 switch (err) { 43 switch (err) {
44 case PROPERTY_LIST_SERVICE_E_SUCCESS: 44 case PROPERTY_LIST_SERVICE_E_SUCCESS:
45 return HOUSE_ARREST_E_SUCCESS; 45 return HOUSE_ARREST_E_SUCCESS;
46 case PROPERTY_LIST_SERVICE_E_INVALID_ARG: 46 case PROPERTY_LIST_SERVICE_E_INVALID_ARG:
47 return HOUSE_ARREST_E_INVALID_ARG; 47 return HOUSE_ARREST_E_INVALID_ARG;
48 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR: 48 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR:
49 return HOUSE_ARREST_E_PLIST_ERROR; 49 return HOUSE_ARREST_E_PLIST_ERROR;
50 case PROPERTY_LIST_SERVICE_E_MUX_ERROR: 50 case PROPERTY_LIST_SERVICE_E_MUX_ERROR:
51 return HOUSE_ARREST_E_CONN_FAILED; 51 return HOUSE_ARREST_E_CONN_FAILED;
52 default: 52 default:
53 break; 53 break;
54 } 54 }
55 return HOUSE_ARREST_E_UNKNOWN_ERROR; 55 return HOUSE_ARREST_E_UNKNOWN_ERROR;
56} 56}
57 57
58/** 58/**
@@ -151,16 +151,16 @@ house_arrest_error_t house_arrest_client_free(house_arrest_client_t client)
151house_arrest_error_t house_arrest_send_request(house_arrest_client_t client, plist_t dict) 151house_arrest_error_t house_arrest_send_request(house_arrest_client_t client, plist_t dict)
152{ 152{
153 if (!client || !client->parent || !dict) 153 if (!client || !client->parent || !dict)
154 return HOUSE_ARREST_E_INVALID_ARG; 154 return HOUSE_ARREST_E_INVALID_ARG;
155 if (plist_get_node_type(dict) != PLIST_DICT) 155 if (plist_get_node_type(dict) != PLIST_DICT)
156 return HOUSE_ARREST_E_PLIST_ERROR; 156 return HOUSE_ARREST_E_PLIST_ERROR;
157 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL) 157 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL)
158 return HOUSE_ARREST_E_INVALID_MODE; 158 return HOUSE_ARREST_E_INVALID_MODE;
159 159
160 house_arrest_error_t res = house_arrest_error(property_list_service_send_xml_plist(client->parent, dict)); 160 house_arrest_error_t res = house_arrest_error(property_list_service_send_xml_plist(client->parent, dict));
161 if (res != HOUSE_ARREST_E_SUCCESS) { 161 if (res != HOUSE_ARREST_E_SUCCESS) {
162 debug_info("could not send plist, error %d", res); 162 debug_info("could not send plist, error %d", res);
163 } 163 }
164 return res; 164 return res;
165} 165}
166 166
@@ -186,7 +186,7 @@ house_arrest_error_t house_arrest_send_request(house_arrest_client_t client, pli
186house_arrest_error_t house_arrest_send_command(house_arrest_client_t client, const char *command, const char *appid) 186house_arrest_error_t house_arrest_send_command(house_arrest_client_t client, const char *command, const char *appid)
187{ 187{
188 if (!client || !client->parent || !command || !appid) 188 if (!client || !client->parent || !command || !appid)
189 return HOUSE_ARREST_E_INVALID_ARG; 189 return HOUSE_ARREST_E_INVALID_ARG;
190 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL) 190 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL)
191 return HOUSE_ARREST_E_INVALID_MODE; 191 return HOUSE_ARREST_E_INVALID_MODE;
192 192
@@ -220,18 +220,18 @@ house_arrest_error_t house_arrest_send_command(house_arrest_client_t client, con
220house_arrest_error_t house_arrest_get_result(house_arrest_client_t client, plist_t *dict) 220house_arrest_error_t house_arrest_get_result(house_arrest_client_t client, plist_t *dict)
221{ 221{
222 if (!client || !client->parent) 222 if (!client || !client->parent)
223 return HOUSE_ARREST_E_INVALID_ARG; 223 return HOUSE_ARREST_E_INVALID_ARG;
224 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL) 224 if (client->mode != HOUSE_ARREST_CLIENT_MODE_NORMAL)
225 return HOUSE_ARREST_E_INVALID_MODE; 225 return HOUSE_ARREST_E_INVALID_MODE;
226 226
227 house_arrest_error_t res = house_arrest_error(property_list_service_receive_plist(client->parent, dict)); 227 house_arrest_error_t res = house_arrest_error(property_list_service_receive_plist(client->parent, dict));
228 if (res != HOUSE_ARREST_E_SUCCESS) { 228 if (res != HOUSE_ARREST_E_SUCCESS) {
229 debug_info("could not get result, error %d", res); 229 debug_info("could not get result, error %d", res);
230 if (*dict) { 230 if (*dict) {
231 plist_free(*dict); 231 plist_free(*dict);
232 *dict = NULL; 232 *dict = NULL;
233 } 233 }
234 } 234 }
235 return res; 235 return res;
236} 236}
237 237
diff --git a/src/idevice.c b/src/idevice.c
index b067fa5..ec426e5 100644
--- a/src/idevice.c
+++ b/src/idevice.c
@@ -71,7 +71,7 @@ idevice_error_t idevice_event_subscribe(idevice_event_cb_t callback, void *user_
71{ 71{
72 event_cb = callback; 72 event_cb = callback;
73 int res = usbmuxd_subscribe(usbmux_event_cb, user_data); 73 int res = usbmuxd_subscribe(usbmux_event_cb, user_data);
74 if (res != 0) { 74 if (res != 0) {
75 event_cb = NULL; 75 event_cb = NULL;
76 debug_info("Error %d when subscribing usbmux event callback!", res); 76 debug_info("Error %d when subscribing usbmux event callback!", res);
77 return IDEVICE_E_UNKNOWN_ERROR; 77 return IDEVICE_E_UNKNOWN_ERROR;
@@ -597,28 +597,28 @@ static int ssl_verify_callback(int ok, X509_STORE_CTX *ctx)
597#ifndef STRIP_DEBUG_CODE 597#ifndef STRIP_DEBUG_CODE
598static const char *errorstring(int e) 598static const char *errorstring(int e)
599{ 599{
600 switch(e) { 600 switch(e) {
601 case SSL_ERROR_NONE: 601 case SSL_ERROR_NONE:
602 return "SSL_ERROR_NONE"; 602 return "SSL_ERROR_NONE";
603 case SSL_ERROR_SSL: 603 case SSL_ERROR_SSL:
604 return "SSL_ERROR_SSL"; 604 return "SSL_ERROR_SSL";
605 case SSL_ERROR_WANT_READ: 605 case SSL_ERROR_WANT_READ:
606 return "SSL_ERROR_WANT_READ"; 606 return "SSL_ERROR_WANT_READ";
607 case SSL_ERROR_WANT_WRITE: 607 case SSL_ERROR_WANT_WRITE:
608 return "SSL_ERROR_WANT_WRITE"; 608 return "SSL_ERROR_WANT_WRITE";
609 case SSL_ERROR_WANT_X509_LOOKUP: 609 case SSL_ERROR_WANT_X509_LOOKUP:
610 return "SSL_ERROR_WANT_X509_LOOKUP"; 610 return "SSL_ERROR_WANT_X509_LOOKUP";
611 case SSL_ERROR_SYSCALL: 611 case SSL_ERROR_SYSCALL:
612 return "SSL_ERROR_SYSCALL"; 612 return "SSL_ERROR_SYSCALL";
613 case SSL_ERROR_ZERO_RETURN: 613 case SSL_ERROR_ZERO_RETURN:
614 return "SSL_ERROR_ZERO_RETURN"; 614 return "SSL_ERROR_ZERO_RETURN";
615 case SSL_ERROR_WANT_CONNECT: 615 case SSL_ERROR_WANT_CONNECT:
616 return "SSL_ERROR_WANT_CONNECT"; 616 return "SSL_ERROR_WANT_CONNECT";
617 case SSL_ERROR_WANT_ACCEPT: 617 case SSL_ERROR_WANT_ACCEPT:
618 return "SSL_ERROR_WANT_ACCEPT"; 618 return "SSL_ERROR_WANT_ACCEPT";
619 default: 619 default:
620 return "UNKOWN_ERROR_VALUE"; 620 return "UNKOWN_ERROR_VALUE";
621 } 621 }
622} 622}
623#endif 623#endif
624#endif 624#endif
@@ -726,7 +726,7 @@ idevice_error_t idevice_connection_enable_ssl(idevice_connection_t connection)
726 SSL_set_bio(ssl, ssl_bio, ssl_bio); 726 SSL_set_bio(ssl, ssl_bio, ssl_bio);
727 727
728 return_me = SSL_do_handshake(ssl); 728 return_me = SSL_do_handshake(ssl);
729 if (return_me != 1) { 729 if (return_me != 1) {
730 debug_info("ERROR in SSL_do_handshake: %s", errorstring(SSL_get_error(ssl, return_me))); 730 debug_info("ERROR in SSL_do_handshake: %s", errorstring(SSL_get_error(ssl, return_me)));
731 BIO_free(ssl_bio); 731 BIO_free(ssl_bio);
732 SSL_CTX_free(ssl_ctx); 732 SSL_CTX_free(ssl_ctx);
diff --git a/src/lockdown.c b/src/lockdown.c
index d94fabb..690ab56 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -1195,6 +1195,7 @@ lockdownd_error_t lockdownd_goodbye(lockdownd_client_t client)
1195 } 1195 }
1196 plist_free(dict); 1196 plist_free(dict);
1197 dict = NULL; 1197 dict = NULL;
1198
1198 return ret; 1199 return ret;
1199} 1200}
1200 1201
diff --git a/src/misagent.c b/src/misagent.c
index 750cf52..a9bf89b 100644
--- a/src/misagent.c
+++ b/src/misagent.c
@@ -40,19 +40,19 @@
40 */ 40 */
41static misagent_error_t misagent_error(property_list_service_error_t err) 41static misagent_error_t misagent_error(property_list_service_error_t err)
42{ 42{
43 switch (err) { 43 switch (err) {
44 case PROPERTY_LIST_SERVICE_E_SUCCESS: 44 case PROPERTY_LIST_SERVICE_E_SUCCESS:
45 return MISAGENT_E_SUCCESS; 45 return MISAGENT_E_SUCCESS;
46 case PROPERTY_LIST_SERVICE_E_INVALID_ARG: 46 case PROPERTY_LIST_SERVICE_E_INVALID_ARG:
47 return MISAGENT_E_INVALID_ARG; 47 return MISAGENT_E_INVALID_ARG;
48 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR: 48 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR:
49 return MISAGENT_E_PLIST_ERROR; 49 return MISAGENT_E_PLIST_ERROR;
50 case PROPERTY_LIST_SERVICE_E_MUX_ERROR: 50 case PROPERTY_LIST_SERVICE_E_MUX_ERROR:
51 return MISAGENT_E_CONN_FAILED; 51 return MISAGENT_E_CONN_FAILED;
52 default: 52 default:
53 break; 53 break;
54 } 54 }
55 return MISAGENT_E_UNKNOWN_ERROR; 55 return MISAGENT_E_UNKNOWN_ERROR;
56} 56}
57 57
58/** 58/**
@@ -171,7 +171,7 @@ misagent_error_t misagent_client_free(misagent_client_t client)
171misagent_error_t misagent_install(misagent_client_t client, plist_t profile) 171misagent_error_t misagent_install(misagent_client_t client, plist_t profile)
172{ 172{
173 if (!client || !client->parent || !profile || (plist_get_node_type(profile) != PLIST_DATA)) 173 if (!client || !client->parent || !profile || (plist_get_node_type(profile) != PLIST_DATA))
174 return MISAGENT_E_INVALID_ARG; 174 return MISAGENT_E_INVALID_ARG;
175 175
176 client->last_error = MISAGENT_E_UNKNOWN_ERROR; 176 client->last_error = MISAGENT_E_UNKNOWN_ERROR;
177 177
@@ -184,10 +184,10 @@ misagent_error_t misagent_install(misagent_client_t client, plist_t profile)
184 plist_free(dict); 184 plist_free(dict);
185 dict = NULL; 185 dict = NULL;
186 186
187 if (res != MISAGENT_E_SUCCESS) { 187 if (res != MISAGENT_E_SUCCESS) {
188 debug_info("could not send plist, error %d", res); 188 debug_info("could not send plist, error %d", res);
189 return res; 189 return res;
190 } 190 }
191 191
192 res = misagent_error(property_list_service_receive_plist(client->parent, &dict)); 192 res = misagent_error(property_list_service_receive_plist(client->parent, &dict));
193 if (res != MISAGENT_E_SUCCESS) { 193 if (res != MISAGENT_E_SUCCESS) {
@@ -222,7 +222,7 @@ misagent_error_t misagent_install(misagent_client_t client, plist_t profile)
222misagent_error_t misagent_copy(misagent_client_t client, plist_t* profiles) 222misagent_error_t misagent_copy(misagent_client_t client, plist_t* profiles)
223{ 223{
224 if (!client || !client->parent || !profiles) 224 if (!client || !client->parent || !profiles)
225 return MISAGENT_E_INVALID_ARG; 225 return MISAGENT_E_INVALID_ARG;
226 226
227 client->last_error = MISAGENT_E_UNKNOWN_ERROR; 227 client->last_error = MISAGENT_E_UNKNOWN_ERROR;
228 228
@@ -234,10 +234,10 @@ misagent_error_t misagent_copy(misagent_client_t client, plist_t* profiles)
234 plist_free(dict); 234 plist_free(dict);
235 dict = NULL; 235 dict = NULL;
236 236
237 if (res != MISAGENT_E_SUCCESS) { 237 if (res != MISAGENT_E_SUCCESS) {
238 debug_info("could not send plist, error %d", res); 238 debug_info("could not send plist, error %d", res);
239 return res; 239 return res;
240 } 240 }
241 241
242 res = misagent_error(property_list_service_receive_plist(client->parent, &dict)); 242 res = misagent_error(property_list_service_receive_plist(client->parent, &dict));
243 if (res != MISAGENT_E_SUCCESS) { 243 if (res != MISAGENT_E_SUCCESS) {
@@ -273,7 +273,7 @@ misagent_error_t misagent_copy(misagent_client_t client, plist_t* profiles)
273misagent_error_t misagent_remove(misagent_client_t client, const char* profileID) 273misagent_error_t misagent_remove(misagent_client_t client, const char* profileID)
274{ 274{
275 if (!client || !client->parent || !profileID) 275 if (!client || !client->parent || !profileID)
276 return MISAGENT_E_INVALID_ARG; 276 return MISAGENT_E_INVALID_ARG;
277 277
278 client->last_error = MISAGENT_E_UNKNOWN_ERROR; 278 client->last_error = MISAGENT_E_UNKNOWN_ERROR;
279 279
@@ -286,10 +286,10 @@ misagent_error_t misagent_remove(misagent_client_t client, const char* profileID
286 plist_free(dict); 286 plist_free(dict);
287 dict = NULL; 287 dict = NULL;
288 288
289 if (res != MISAGENT_E_SUCCESS) { 289 if (res != MISAGENT_E_SUCCESS) {
290 debug_info("could not send plist, error %d", res); 290 debug_info("could not send plist, error %d", res);
291 return res; 291 return res;
292 } 292 }
293 293
294 res = misagent_error(property_list_service_receive_plist(client->parent, &dict)); 294 res = misagent_error(property_list_service_receive_plist(client->parent, &dict));
295 if (res != MISAGENT_E_SUCCESS) { 295 if (res != MISAGENT_E_SUCCESS) {
diff --git a/src/sbservices.c b/src/sbservices.c
index 9b66c7f..c761070 100644
--- a/src/sbservices.c
+++ b/src/sbservices.c
@@ -61,19 +61,19 @@ static void sbs_unlock(sbservices_client_t client)
61 */ 61 */
62static sbservices_error_t sbservices_error(property_list_service_error_t err) 62static sbservices_error_t sbservices_error(property_list_service_error_t err)
63{ 63{
64 switch (err) { 64 switch (err) {
65 case PROPERTY_LIST_SERVICE_E_SUCCESS: 65 case PROPERTY_LIST_SERVICE_E_SUCCESS:
66 return SBSERVICES_E_SUCCESS; 66 return SBSERVICES_E_SUCCESS;
67 case PROPERTY_LIST_SERVICE_E_INVALID_ARG: 67 case PROPERTY_LIST_SERVICE_E_INVALID_ARG:
68 return SBSERVICES_E_INVALID_ARG; 68 return SBSERVICES_E_INVALID_ARG;
69 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR: 69 case PROPERTY_LIST_SERVICE_E_PLIST_ERROR:
70 return SBSERVICES_E_PLIST_ERROR; 70 return SBSERVICES_E_PLIST_ERROR;
71 case PROPERTY_LIST_SERVICE_E_MUX_ERROR: 71 case PROPERTY_LIST_SERVICE_E_MUX_ERROR:
72 return SBSERVICES_E_CONN_FAILED; 72 return SBSERVICES_E_CONN_FAILED;
73 default: 73 default:
74 break; 74 break;
75 } 75 }
76 return SBSERVICES_E_UNKNOWN_ERROR; 76 return SBSERVICES_E_UNKNOWN_ERROR;
77} 77}
78 78
79/** 79/**
diff --git a/tools/idevicescreenshot.c b/tools/idevicescreenshot.c
index d056dd0..8f5fcaf 100644
--- a/tools/idevicescreenshot.c
+++ b/tools/idevicescreenshot.c
@@ -124,16 +124,16 @@ int main(int argc, char **argv)
124 124
125void print_usage(int argc, char **argv) 125void print_usage(int argc, char **argv)
126{ 126{
127 char *name = NULL; 127 char *name = NULL;
128 128
129 name = strrchr(argv[0], '/'); 129 name = strrchr(argv[0], '/');
130 printf("Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0])); 130 printf("Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
131 printf("Gets a screenshot from a device.\n"); 131 printf("Gets a screenshot from a device.\n");
132 printf("The screenshot is saved as a TIFF image in the current directory.\n"); 132 printf("The screenshot is saved as a TIFF image in the current directory.\n");
133 printf("NOTE: A mounted developer disk image is required on the device, otherwise\n"); 133 printf("NOTE: A mounted developer disk image is required on the device, otherwise\n");
134 printf("the screenshotr service is not available.\n\n"); 134 printf("the screenshotr service is not available.\n\n");
135 printf(" -d, --debug\t\tenable communication debugging\n"); 135 printf(" -d, --debug\t\tenable communication debugging\n");
136 printf(" -u, --udid UDID\ttarget specific device by its 40-digit device UDID\n"); 136 printf(" -u, --udid UDID\ttarget specific device by its 40-digit device UDID\n");
137 printf(" -h, --help\t\tprints usage information\n"); 137 printf(" -h, --help\t\tprints usage information\n");
138 printf("\n"); 138 printf("\n");
139} 139}