From 0a5547e97bfd0c0e95c4efb032bc2867cc5a60f0 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Mon, 8 Jun 2020 23:49:45 +0200 Subject: Remove trailing whitespace errors from all files --- src/common.c | 2 +- src/download.h | 4 +- src/fdr.c | 2 +- src/ftab.c | 2 +- src/idevicerestore.c | 6 +-- src/img3.c | 2 +- src/jsmn.c | 10 ++-- src/jsmn.h | 2 +- src/json_plist.c | 4 +- src/limera1n.c | 4 +- src/limera1n.h | 2 +- src/limera1n_payload.h | 138 ++++++++++++++++++++++++------------------------- src/locking.h | 2 +- src/normal.c | 2 +- src/recovery.c | 2 +- src/restore.c | 9 ++-- src/tss.c | 2 +- 17 files changed, 97 insertions(+), 98 deletions(-) diff --git a/src/common.c b/src/common.c index 6f113c5..b5c88ee 100644 --- a/src/common.c +++ b/src/common.c @@ -290,7 +290,7 @@ int mkdir_with_parents(const char *dir, int mode) if (parentdir && (strcmp(parentdir, ".") != 0) && (strcmp(parentdir, dir) != 0)) { res = mkdir_with_parents(parentdir, mode); } else { - res = -1; + res = -1; } free(parent); if (res == 0) { diff --git a/src/download.h b/src/download.h index 733a292..1edde5b 100644 --- a/src/download.h +++ b/src/download.h @@ -9,12 +9,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/fdr.c b/src/fdr.c index e21d134..a1953d6 100644 --- a/src/fdr.c +++ b/src/fdr.c @@ -246,7 +246,7 @@ static int fdr_send_plist(fdr_client_t fdr, plist_t data) debug_plist(data); device_error = idevice_connection_send(fdr->connection, (char *)&len, sizeof(len), &bytes); if (device_error != IDEVICE_E_SUCCESS || bytes != sizeof(len)) { - error("ERROR: FDR unable to send data length. (%d) Sent %u of %u bytes.\n", + error("ERROR: FDR unable to send data length. (%d) Sent %u of %u bytes.\n", device_error, bytes, (uint32_t)sizeof(len)); free(buf); return -1; diff --git a/src/ftab.c b/src/ftab.c index 8b40c24..8515d1f 100644 --- a/src/ftab.c +++ b/src/ftab.c @@ -76,7 +76,7 @@ int ftab_parse(unsigned char *data, unsigned int data_size, ftab_t *ftab, uint32 memcpy(ftab_new->storage[i], data + ftab_new->entries[i].offset, ftab_new->entries[i].size); } - *ftab = ftab_new; + *ftab = ftab_new; return 0; } diff --git a/src/idevicerestore.c b/src/idevicerestore.c index 996b3c7..0ffe5a8 100644 --- a/src/idevicerestore.c +++ b/src/idevicerestore.c @@ -347,7 +347,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client) error("ERROR: Could not open device in WTF mode\n"); return -1; } - if ((dfu_get_cpid(client, &cpid) < 0) || (cpid == 0)) { + if ((dfu_get_cpid(client, &cpid) < 0) || (cpid == 0)) { error("ERROR: Could not get CPID for WTF mode device\n"); dfu_client_free(client); return -1; @@ -999,7 +999,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client) remove(tmpf); rename(filesystem, tmpf); free(filesystem); - filesystem = strdup(tmpf); + filesystem = strdup(tmpf); } } @@ -2205,7 +2205,7 @@ int get_tss_response(struct idevicerestore_client_t* client, plist_t build_ident if (node) { plist_dict_set_item(parameters, "BbSNUM", plist_copy(node)); } - + /* add baseband parameters */ tss_request_add_baseband_tags(request, parameters, NULL); diff --git a/src/img3.c b/src/img3.c index c58d8a3..fb8d49e 100644 --- a/src/img3.c +++ b/src/img3.c @@ -413,7 +413,7 @@ int img3_stitch_component(const char* component_name, const unsigned char* compo } info("Personalizing IMG3 component %s...\n", component_name); - + /* parse current component as img3 */ img3 = img3_parse_file(component_data, component_size); if (img3 == NULL) { diff --git a/src/jsmn.c b/src/jsmn.c index ddc440d..a56f20a 100644 --- a/src/jsmn.c +++ b/src/jsmn.c @@ -30,7 +30,7 @@ /** * Allocates a fresh unused token from the token pull. */ -static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *tok; if (parser->toknext >= num_tokens) { @@ -48,7 +48,7 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, /** * Fills token type and boundaries. */ -static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, int start, int end) { token->type = type; token->start = start; @@ -156,7 +156,7 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, /** * Parse JSON string and fill tokens. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, unsigned int num_tokens) { jsmnerr_t r; int i; @@ -232,7 +232,7 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, if (parser->toksuper != -1) tokens[parser->toksuper].size++; break; - case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ': + case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ': break; #ifdef JSMN_STRICT /* In strict mode primitives are: numbers and booleans */ @@ -269,7 +269,7 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, } /** - * Creates a new parser based over a given buffer with an array of tokens + * Creates a new parser based over a given buffer with an array of tokens * available. */ void jsmn_init(jsmn_parser *parser) { diff --git a/src/jsmn.h b/src/jsmn.h index 376ee83..f12dc5a 100644 --- a/src/jsmn.h +++ b/src/jsmn.h @@ -85,7 +85,7 @@ void jsmn_init(jsmn_parser *parser); * Run JSON parser. It parses a JSON data string into and array of tokens, each describing * a single JSON object. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, unsigned int num_tokens); #endif /* __JSMN_H_ */ diff --git a/src/json_plist.c b/src/json_plist.c index e61e3cb..7bbead0 100644 --- a/src/json_plist.c +++ b/src/json_plist.c @@ -47,7 +47,7 @@ static plist_t parse_primitive(const char* js, jsmntok_t* tokens, int* index) fprintf(stderr, "%s: ERROR: token type != JSMN_PRIMITIVE?!\n", __func__); return NULL; } - plist_t val = NULL; + plist_t val = NULL; char* strval = get_string_value(js, tokens[*index]); if (strval[0] == 'f') { val = plist_new_bool(0); @@ -188,7 +188,7 @@ reparse: goto reparse; } } - + switch(r) { case JSMN_ERROR_NOMEM: fprintf(stderr, "%s: ERROR: Out of memory...\n", __func__); diff --git a/src/limera1n.c b/src/limera1n.c index 1ec3661..da4a7d5 100644 --- a/src/limera1n.c +++ b/src/limera1n.c @@ -1,7 +1,7 @@ /* * limera1n.c * Helper code for limera1n exploit based on discovery by geohot - * + * * Copyright (c) 2012-2013 Nikias Bassen. All Rights Reserved. * Copyright (c) 2012 Martin Szulecki. All Rights Reserved. * Copyright (C) 2010 Chronic-Dev Team @@ -76,7 +76,7 @@ int limera1n_exploit(struct irecv_device *device, irecv_client_t *pclient) } else if (device->chip_id == ipod3g->chip_id) { max_size = 0x24000; stack_address = 0x84033F98; - shellcode_address = 0x84023001; + shellcode_address = 0x84023001; } else { error("Unsupported ChipID 0x%04x. Can't exploit with limera1n.\n", device->chip_id); return -1; diff --git a/src/limera1n.h b/src/limera1n.h index 2c92001..592d8d8 100644 --- a/src/limera1n.h +++ b/src/limera1n.h @@ -1,7 +1,7 @@ /* * limera1n.h * Helper code for limera1n exploit based on discovery by geohot - * + * * Copyright (c) 2012-2013 Nikias Bassen. All Rights Reserved. * * This library is free software; you can redistribute it and/or diff --git a/src/limera1n_payload.h b/src/limera1n_payload.h index 0a213db..e3117a1 100644 --- a/src/limera1n_payload.h +++ b/src/limera1n_payload.h @@ -1,7 +1,7 @@ /* * limera1n_payload.h * Payload for limera1n exploit - * + * * Copyright (c) 2012 Nikias Bassen. All Rights Reserved. * * This library is free software; you can redistribute it and/or @@ -23,74 +23,74 @@ extern unsigned char limera1n_payload[]; unsigned char limera1n_payload[] = { 0x7f, 0x46, 0x07, 0xe0, 0xc0, 0x46, 0xc0, 0x46, - 0xc0, 0x46, 0xc0, 0x46, 0xc0, 0x46, 0xc0, 0x46, - 0xc0, 0x46, 0xc0, 0x46, 0x61, 0x48, 0x02, 0x68, - 0x61, 0x48, 0x90, 0x42, 0x06, 0xd1, 0x61, 0x49, - 0x39, 0x60, 0x61, 0x49, 0x79, 0x60, 0x61, 0x49, - 0xb9, 0x60, 0x1c, 0xe0, 0x60, 0x48, 0x90, 0x42, - 0x06, 0xd1, 0x60, 0x49, 0x39, 0x60, 0x60, 0x49, - 0x79, 0x60, 0x60, 0x49, 0xb9, 0x60, 0x12, 0xe0, - 0x5f, 0x48, 0x90, 0x42, 0x06, 0xd1, 0x5f, 0x49, - 0x39, 0x60, 0x5f, 0x49, 0x79, 0x60, 0x5f, 0x49, - 0xb9, 0x60, 0x08, 0xe0, 0x5e, 0x48, 0x90, 0x42, - 0x05, 0xd1, 0x5e, 0x49, 0x39, 0x60, 0x5a, 0x49, - 0x79, 0x60, 0x5d, 0x49, 0xb9, 0x60, 0x5d, 0x48, - 0x5d, 0x49, 0x3b, 0x68, 0x98, 0x47, 0x5d, 0x48, - 0x5a, 0x49, 0x4a, 0x68, 0x00, 0xf0, 0x80, 0xf8, - 0x00, 0x28, 0xcb, 0xd0, 0x06, 0x1c, 0x5a, 0x48, - 0x56, 0x49, 0x4a, 0x68, 0x00, 0xf0, 0x78, 0xf8, - 0x00, 0x28, 0xc3, 0xd0, 0x05, 0x1c, 0x11, 0x20, - 0x14, 0x24, 0x29, 0x19, 0x2a, 0x19, 0x30, 0x23, - 0x54, 0x4c, 0x00, 0x94, 0x00, 0x24, 0x01, 0x94, - 0x00, 0x24, 0x02, 0x94, 0x7c, 0x68, 0xa0, 0x47, - 0x11, 0x20, 0x0c, 0x24, 0x31, 0x19, 0x32, 0x19, - 0xb3, 0x68, 0x4f, 0x4c, 0x00, 0x94, 0x24, 0x24, - 0x64, 0x19, 0x01, 0x94, 0x14, 0x24, 0x64, 0x19, - 0x02, 0x94, 0x7c, 0x68, 0xa0, 0x47, 0x45, 0x48, - 0x0c, 0x21, 0x89, 0x19, 0xb2, 0x68, 0x15, 0x1c, - 0x00, 0xf0, 0x4a, 0xf8, 0x47, 0x48, 0x41, 0x49, - 0x2a, 0x1c, 0x00, 0xf0, 0x4d, 0xf8, 0x00, 0x28, - 0x08, 0xd0, 0x01, 0x1c, 0x44, 0x48, 0x45, 0x4a, - 0x00, 0xf0, 0x46, 0xf8, 0x00, 0x28, 0x01, 0xd0, - 0x43, 0x49, 0x01, 0x60, 0x43, 0x48, 0x39, 0x49, - 0x2a, 0x1c, 0x00, 0xf0, 0x3d, 0xf8, 0x00, 0x28, - 0x08, 0xd0, 0x01, 0x1c, 0x40, 0x48, 0x3d, 0x4a, - 0x00, 0xf0, 0x36, 0xf8, 0x00, 0x28, 0x01, 0xd0, - 0x3e, 0x49, 0x01, 0x60, 0x3e, 0x48, 0x31, 0x49, - 0x2a, 0x1c, 0x00, 0xf0, 0x2d, 0xf8, 0x00, 0x28, - 0x08, 0xd0, 0x01, 0x1c, 0x3b, 0x48, 0x35, 0x4a, - 0x00, 0xf0, 0x26, 0xf8, 0x00, 0x28, 0x01, 0xd0, - 0x33, 0x49, 0x01, 0x60, 0x38, 0x48, 0x29, 0x49, - 0x2a, 0x1c, 0x38, 0x4b, 0x00, 0xf0, 0x1e, 0xf8, - 0x00, 0x28, 0x07, 0xd1, 0x36, 0x48, 0x25, 0x49, - 0x2a, 0x1c, 0x36, 0x4b, 0x00, 0xf0, 0x16, 0xf8, - 0x00, 0x28, 0x03, 0xd0, 0x34, 0x49, 0x01, 0x60, - 0x34, 0x49, 0x41, 0x60, 0x00, 0x20, 0x1f, 0x49, - 0x00, 0x22, 0xbb, 0x68, 0x98, 0x47, 0x55, 0xe7, - 0x0b, 0x68, 0x03, 0x60, 0x01, 0x30, 0x01, 0x31, - 0x01, 0x3a, 0x00, 0x2a, 0xf8, 0xd1, 0x70, 0x47, - 0x00, 0x23, 0xff, 0xe7, 0x10, 0xb5, 0x0c, 0x68, - 0x84, 0x42, 0x04, 0xd1, 0x00, 0x2b, 0x07, 0xd0, - 0x4c, 0x68, 0x9c, 0x42, 0x04, 0xd0, 0x02, 0x31, - 0x02, 0x3a, 0x00, 0x2a, 0xf3, 0xd1, 0x00, 0x21, - 0x08, 0x1c, 0x10, 0xbd, 0x88, 0x02, 0x00, 0x00, - 0x39, 0x2e, 0x35, 0x00, 0xe5, 0x36, 0x00, 0x00, - 0x19, 0x09, 0x00, 0x00, 0xdd, 0x39, 0x00, 0x00, - 0x34, 0x2e, 0x34, 0x00, 0x85, 0x4c, 0x00, 0x00, - 0x6d, 0x68, 0x00, 0x00, 0x5d, 0x5a, 0x00, 0x00, - 0x39, 0x2e, 0x33, 0x00, 0x9d, 0x34, 0x00, 0x00, - 0x25, 0x09, 0x00, 0x00, 0x69, 0x39, 0x00, 0x00, - 0x39, 0x2e, 0x33, 0x2e, 0xa5, 0x34, 0x00, 0x00, - 0x71, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x00, 0xc0, 0x02, 0x00, 0x41, 0x54, 0x41, 0x44, - 0x47, 0x41, 0x42, 0x4b, 0x00, 0x02, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x20, 0x1a, 0x78, 0xff, 0x2a, - 0x4f, 0xf0, 0xff, 0x30, 0x00, 0x02, 0x00, 0x00, - 0x00, 0x20, 0x00, 0x20, 0xf3, 0xdf, 0x90, 0xb5, - 0x07, 0x4b, 0x1b, 0x68, 0x4f, 0xf0, 0xff, 0x33, - 0x11, 0x9a, 0xd3, 0xf1, 0x18, 0xbf, 0x01, 0x20, - 0x80, 0xb5, 0x00, 0xaf, 0x82, 0xb0, 0x4f, 0xf0, - 0xb0, 0xb5, 0x02, 0xaf, 0x82, 0xb0, 0x01, 0x28, + 0xc0, 0x46, 0xc0, 0x46, 0xc0, 0x46, 0xc0, 0x46, + 0xc0, 0x46, 0xc0, 0x46, 0x61, 0x48, 0x02, 0x68, + 0x61, 0x48, 0x90, 0x42, 0x06, 0xd1, 0x61, 0x49, + 0x39, 0x60, 0x61, 0x49, 0x79, 0x60, 0x61, 0x49, + 0xb9, 0x60, 0x1c, 0xe0, 0x60, 0x48, 0x90, 0x42, + 0x06, 0xd1, 0x60, 0x49, 0x39, 0x60, 0x60, 0x49, + 0x79, 0x60, 0x60, 0x49, 0xb9, 0x60, 0x12, 0xe0, + 0x5f, 0x48, 0x90, 0x42, 0x06, 0xd1, 0x5f, 0x49, + 0x39, 0x60, 0x5f, 0x49, 0x79, 0x60, 0x5f, 0x49, + 0xb9, 0x60, 0x08, 0xe0, 0x5e, 0x48, 0x90, 0x42, + 0x05, 0xd1, 0x5e, 0x49, 0x39, 0x60, 0x5a, 0x49, + 0x79, 0x60, 0x5d, 0x49, 0xb9, 0x60, 0x5d, 0x48, + 0x5d, 0x49, 0x3b, 0x68, 0x98, 0x47, 0x5d, 0x48, + 0x5a, 0x49, 0x4a, 0x68, 0x00, 0xf0, 0x80, 0xf8, + 0x00, 0x28, 0xcb, 0xd0, 0x06, 0x1c, 0x5a, 0x48, + 0x56, 0x49, 0x4a, 0x68, 0x00, 0xf0, 0x78, 0xf8, + 0x00, 0x28, 0xc3, 0xd0, 0x05, 0x1c, 0x11, 0x20, + 0x14, 0x24, 0x29, 0x19, 0x2a, 0x19, 0x30, 0x23, + 0x54, 0x4c, 0x00, 0x94, 0x00, 0x24, 0x01, 0x94, + 0x00, 0x24, 0x02, 0x94, 0x7c, 0x68, 0xa0, 0x47, + 0x11, 0x20, 0x0c, 0x24, 0x31, 0x19, 0x32, 0x19, + 0xb3, 0x68, 0x4f, 0x4c, 0x00, 0x94, 0x24, 0x24, + 0x64, 0x19, 0x01, 0x94, 0x14, 0x24, 0x64, 0x19, + 0x02, 0x94, 0x7c, 0x68, 0xa0, 0x47, 0x45, 0x48, + 0x0c, 0x21, 0x89, 0x19, 0xb2, 0x68, 0x15, 0x1c, + 0x00, 0xf0, 0x4a, 0xf8, 0x47, 0x48, 0x41, 0x49, + 0x2a, 0x1c, 0x00, 0xf0, 0x4d, 0xf8, 0x00, 0x28, + 0x08, 0xd0, 0x01, 0x1c, 0x44, 0x48, 0x45, 0x4a, + 0x00, 0xf0, 0x46, 0xf8, 0x00, 0x28, 0x01, 0xd0, + 0x43, 0x49, 0x01, 0x60, 0x43, 0x48, 0x39, 0x49, + 0x2a, 0x1c, 0x00, 0xf0, 0x3d, 0xf8, 0x00, 0x28, + 0x08, 0xd0, 0x01, 0x1c, 0x40, 0x48, 0x3d, 0x4a, + 0x00, 0xf0, 0x36, 0xf8, 0x00, 0x28, 0x01, 0xd0, + 0x3e, 0x49, 0x01, 0x60, 0x3e, 0x48, 0x31, 0x49, + 0x2a, 0x1c, 0x00, 0xf0, 0x2d, 0xf8, 0x00, 0x28, + 0x08, 0xd0, 0x01, 0x1c, 0x3b, 0x48, 0x35, 0x4a, + 0x00, 0xf0, 0x26, 0xf8, 0x00, 0x28, 0x01, 0xd0, + 0x33, 0x49, 0x01, 0x60, 0x38, 0x48, 0x29, 0x49, + 0x2a, 0x1c, 0x38, 0x4b, 0x00, 0xf0, 0x1e, 0xf8, + 0x00, 0x28, 0x07, 0xd1, 0x36, 0x48, 0x25, 0x49, + 0x2a, 0x1c, 0x36, 0x4b, 0x00, 0xf0, 0x16, 0xf8, + 0x00, 0x28, 0x03, 0xd0, 0x34, 0x49, 0x01, 0x60, + 0x34, 0x49, 0x41, 0x60, 0x00, 0x20, 0x1f, 0x49, + 0x00, 0x22, 0xbb, 0x68, 0x98, 0x47, 0x55, 0xe7, + 0x0b, 0x68, 0x03, 0x60, 0x01, 0x30, 0x01, 0x31, + 0x01, 0x3a, 0x00, 0x2a, 0xf8, 0xd1, 0x70, 0x47, + 0x00, 0x23, 0xff, 0xe7, 0x10, 0xb5, 0x0c, 0x68, + 0x84, 0x42, 0x04, 0xd1, 0x00, 0x2b, 0x07, 0xd0, + 0x4c, 0x68, 0x9c, 0x42, 0x04, 0xd0, 0x02, 0x31, + 0x02, 0x3a, 0x00, 0x2a, 0xf3, 0xd1, 0x00, 0x21, + 0x08, 0x1c, 0x10, 0xbd, 0x88, 0x02, 0x00, 0x00, + 0x39, 0x2e, 0x35, 0x00, 0xe5, 0x36, 0x00, 0x00, + 0x19, 0x09, 0x00, 0x00, 0xdd, 0x39, 0x00, 0x00, + 0x34, 0x2e, 0x34, 0x00, 0x85, 0x4c, 0x00, 0x00, + 0x6d, 0x68, 0x00, 0x00, 0x5d, 0x5a, 0x00, 0x00, + 0x39, 0x2e, 0x33, 0x00, 0x9d, 0x34, 0x00, 0x00, + 0x25, 0x09, 0x00, 0x00, 0x69, 0x39, 0x00, 0x00, + 0x39, 0x2e, 0x33, 0x2e, 0xa5, 0x34, 0x00, 0x00, + 0x71, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, + 0x00, 0xc0, 0x02, 0x00, 0x41, 0x54, 0x41, 0x44, + 0x47, 0x41, 0x42, 0x4b, 0x00, 0x02, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x20, 0x1a, 0x78, 0xff, 0x2a, + 0x4f, 0xf0, 0xff, 0x30, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x20, 0x00, 0x20, 0xf3, 0xdf, 0x90, 0xb5, + 0x07, 0x4b, 0x1b, 0x68, 0x4f, 0xf0, 0xff, 0x33, + 0x11, 0x9a, 0xd3, 0xf1, 0x18, 0xbf, 0x01, 0x20, + 0x80, 0xb5, 0x00, 0xaf, 0x82, 0xb0, 0x4f, 0xf0, + 0xb0, 0xb5, 0x02, 0xaf, 0x82, 0xb0, 0x01, 0x28, 0x00, 0x4b, 0x18, 0x47, 0x00, 0x00, 0x00, 0x41 }; __attribute__((unused)) diff --git a/src/locking.h b/src/locking.h index 4114f1b..d5b07ec 100644 --- a/src/locking.h +++ b/src/locking.h @@ -34,7 +34,7 @@ typedef struct { #else FILE* fp; struct flock ldata; -#endif +#endif } lock_info_t; int lock_file(const char* filename, lock_info_t* lockp); diff --git a/src/normal.c b/src/normal.c index c05ed9d..d098066 100644 --- a/src/normal.c +++ b/src/normal.c @@ -145,7 +145,7 @@ int normal_check_mode(struct idevicerestore_client_t* client) { if (!device) { return -1; } - idevice_free(device); + idevice_free(device); return 0; } diff --git a/src/recovery.c b/src/recovery.c index 4bb1b9d..c518b28 100644 --- a/src/recovery.c +++ b/src/recovery.c @@ -249,7 +249,7 @@ int recovery_send_ticket(struct idevicerestore_client_t* client) { if (!client->tss) { error("ERROR: ApTicket requested but no TSS present\n"); - return -1; + return -1; } unsigned char* data = NULL; diff --git a/src/restore.c b/src/restore.c index d6b0fc2..4f09ccc 100644 --- a/src/restore.c +++ b/src/restore.c @@ -193,7 +193,6 @@ static int restore_idevice_new(struct idevicerestore_client_t* client, idevice_t plist_t hwinfo = NULL; if (restored_query_value(restore, "HardwareInfo", &hwinfo) != RESTORE_E_SUCCESS) { - continue; } @@ -1239,7 +1238,7 @@ static const char* restore_get_bbfw_fn_for_element(const char* elem) { "RestoreDBL", "restoredbl.mbn" }, // Phoenix/Mav4 firmware files { "DBL", "dbl.mbn" }, - { "ENANDPRG", "ENPRG.mbn" }, + { "ENANDPRG", "ENPRG.mbn" }, // Mav5 firmware files { "RestoreSBL1", "restoresbl1.mbn" }, { "SBL1", "sbl1.mbn" }, @@ -1695,7 +1694,7 @@ static int restore_send_baseband_data(restored_client_t restore, struct idevicer return -1; } char* bbfwpath = NULL; - plist_get_string_val(bbfw_path, &bbfwpath); + plist_get_string_val(bbfw_path, &bbfwpath); if (!bbfwpath) { error("ERROR: Unable to get baseband path\n"); plist_free(response); @@ -1729,7 +1728,7 @@ static int restore_send_baseband_data(restored_client_t restore, struct idevicer } res = -1; - + size_t sz = 0; if (read_file(bbfwtmp, (void**)&buffer, &sz) < 0) { error("ERROR: could not read updated bbfw archive\n"); @@ -2741,7 +2740,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit if (client->preflight_info) { plist_t node; - plist_t bbus = plist_copy(client->preflight_info); + plist_t bbus = plist_copy(client->preflight_info); plist_dict_remove_item(bbus, "FusingStatus"); plist_dict_remove_item(bbus, "PkHash"); diff --git a/src/tss.c b/src/tss.c index a309e18..739e7b1 100644 --- a/src/tss.c +++ b/src/tss.c @@ -1459,7 +1459,7 @@ plist_t tss_request_send(plist_t tss_request, const char* server_url_string) { curl_easy_perform(handle); curl_slist_free_all(header); curl_easy_cleanup(handle); - + if (strstr(response->content, "MESSAGE=SUCCESS")) { status_code = 0; info("response successfully received\n"); -- cgit v1.1-32-gdbae