Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recovery: [cosmetic] replace whitespaces with tabs where appropriate 

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
(cherry picked from commit f806979c84)
This commit is contained in:
Hector Palacios 2021-08-25 12:16:01 +02:00
parent 846bccc8bf
commit c93945c995
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c
View File

@ -332,7 +332,7 @@ static int is_subset(char **subset, char **set)
* Description: convert a list into a NULL-terminated string array, while checking against a blacklist and a superset * Description: convert a list into a NULL-terminated string array, while checking against a blacklist and a superset
*/ */
static int list_to_array(char *list, char **array, char **blacklist, static int list_to_array(char *list, char **array, char **blacklist,
char **superset, const char *delim, unsigned char limit) char **superset, const char *delim, unsigned char limit)
{ {
char *tmp = NULL; char *tmp = NULL;
char *entry = NULL; char *entry = NULL;
@ -618,10 +618,10 @@ int update_firmware(const char *swu_path)
int ret = -1; int ret = -1;
/* Check if we are in dualboot mode */ /* Check if we are in dualboot mode */
if (is_dualboot_enabled()) { if (is_dualboot_enabled()) {
fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n"); fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n");
goto err; goto err;
} }
/* Verify input parameter */ /* Verify input parameter */
if (!swu_path) { if (!swu_path) {
@ -664,10 +664,10 @@ int reboot_recovery(unsigned int reboot_timeout)
int ret = 0; int ret = 0;
/* Check if we are in dualboot mode */ /* Check if we are in dualboot mode */
if (is_dualboot_enabled()) { if (is_dualboot_enabled()) {
fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n"); fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n");
goto err; goto err;
} }
sync(); sync();
@ -714,10 +714,10 @@ int set_encryption_key(char *key, unsigned char force)
unsigned char i = 0; unsigned char i = 0;
/* Check if we are in dualboot mode */ /* Check if we are in dualboot mode */
if (is_dualboot_enabled()) { if (is_dualboot_enabled()) {
fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n"); fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n");
return ret; return ret;
} }
/* Initialize arrays */ /* Initialize arrays */
parts[0] = NULL; parts[0] = NULL;
@ -773,10 +773,8 @@ int set_encryption_key(char *key, unsigned char force)
} }
} }
key_cmd = key_cmd = calloc(1, strlen("encryption_key=") +
calloc(1, (generate_random_key ? 0 : strlen(key)) + 1);
strlen("encryption_key=") +
(generate_random_key ? 0 : strlen(key)) + 1);
if (!key_cmd) { if (!key_cmd) {
fprintf(stderr, "Error: calloc 'key_cmd'\n"); fprintf(stderr, "Error: calloc 'key_cmd'\n");
goto err; goto err;
@ -820,10 +818,10 @@ int encrypt_partitions(char *to_encrypt, char *to_unencrypt, unsigned char force
int ret; int ret;
/* Check if we are in dualboot mode */ /* Check if we are in dualboot mode */
if (is_dualboot_enabled()) { if (is_dualboot_enabled()) {
fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n"); fprintf(stderr, "Error: dualboot enabled recovery cannot be used\n");
return 1; return 1;
} }
/* If both lists are empty, we have nothing to do */ /* If both lists are empty, we have nothing to do */
if (!to_encrypt && !to_unencrypt) if (!to_encrypt && !to_unencrypt)