Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 16:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fw_env: rename variables holding env data content

Browse source 
Rename "addr0" and "addr1" to "buf0" and "buf1" accordingly. Name "addr"
suggests that variable contains a numeric value being some kind of
address. Name "buf" is de facto a standard name for pointer to allocated
memory for reading data to.

While at it drop redundant checks for NULL before calling free().

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2023-12-13 10:23:44 +01:00 • committed by Tom Rini
parent f29c5ca33d
commit 73b30800f5
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tools/env/fw_env.c vendored
View file

@ -1416,11 +1416,11 @@ int fw_env_open(struct env_opts *opts)
{ {
int crc0, crc0_ok; int crc0, crc0_ok;
unsigned char flag0; unsigned char flag0;
void *addr0 = NULL; void *buf0 = NULL;
int crc1, crc1_ok; int crc1, crc1_ok;
unsigned char flag1; unsigned char flag1;
void *addr1 = NULL; void *buf1 = NULL;
int ret; int ret;
@ -1430,8 +1430,8 @@ int fw_env_open(struct env_opts *opts)
if (parse_config(opts)) /* should fill envdevices */ if (parse_config(opts)) /* should fill envdevices */
return -EINVAL; return -EINVAL;
addr0 = calloc(1, CUR_ENVSIZE); buf0 = calloc(1, CUR_ENVSIZE);
if (addr0 == NULL) { if (buf0 == NULL) {
fprintf(stderr, fprintf(stderr,
"Not enough memory for environment (%ld bytes)\n", "Not enough memory for environment (%ld bytes)\n",
CUR_ENVSIZE); CUR_ENVSIZE);
@ -1440,13 +1440,13 @@ int fw_env_open(struct env_opts *opts)
} }
dev_current = 0; dev_current = 0;
if (flash_io(O_RDONLY, addr0, CUR_ENVSIZE)) { if (flash_io(O_RDONLY, buf0, CUR_ENVSIZE)) {
ret = -EIO; ret = -EIO;
goto open_cleanup; goto open_cleanup;
} }
if (!have_redund_env) { if (!have_redund_env) {
struct env_image_single *single = addr0; struct env_image_single *single = buf0;
crc0 = crc32(0, (uint8_t *)single->data, ENV_SIZE); crc0 = crc32(0, (uint8_t *)single->data, ENV_SIZE);
crc0_ok = (crc0 == single->crc); crc0_ok = (crc0 == single->crc);
@ -1458,12 +1458,12 @@ int fw_env_open(struct env_opts *opts)
environment.dirty = 1; environment.dirty = 1;
} }
environment.image = addr0; environment.image = buf0;
environment.crc = &single->crc; environment.crc = &single->crc;
environment.flags = NULL; environment.flags = NULL;
environment.data = single->data; environment.data = single->data;
} else { } else {
struct env_image_redundant *redundant0 = addr0; struct env_image_redundant *redundant0 = buf0;
struct env_image_redundant *redundant1; struct env_image_redundant *redundant1;
crc0 = crc32(0, (uint8_t *)redundant0->data, ENV_SIZE); crc0 = crc32(0, (uint8_t *)redundant0->data, ENV_SIZE);
@ -1472,17 +1472,17 @@ int fw_env_open(struct env_opts *opts)
flag0 = redundant0->flags; flag0 = redundant0->flags;
dev_current = 1; dev_current = 1;
addr1 = calloc(1, CUR_ENVSIZE); buf1 = calloc(1, CUR_ENVSIZE);
if (addr1 == NULL) { if (buf1 == NULL) {
fprintf(stderr, fprintf(stderr,
"Not enough memory for environment (%ld bytes)\n", "Not enough memory for environment (%ld bytes)\n",
CUR_ENVSIZE); CUR_ENVSIZE);
ret = -ENOMEM; ret = -ENOMEM;
goto open_cleanup; goto open_cleanup;
} }
redundant1 = addr1; redundant1 = buf1;
if (flash_io(O_RDONLY, addr1, CUR_ENVSIZE)) { if (flash_io(O_RDONLY, buf1, CUR_ENVSIZE)) {
ret = -EIO; ret = -EIO;
goto open_cleanup; goto open_cleanup;
} }
@ -1571,17 +1571,17 @@ int fw_env_open(struct env_opts *opts)
* flags before writing out * flags before writing out
*/ */
if (dev_current) { if (dev_current) {
environment.image = addr1; environment.image = buf1;
environment.crc = &redundant1->crc; environment.crc = &redundant1->crc;
environment.flags = &redundant1->flags; environment.flags = &redundant1->flags;
environment.data = redundant1->data; environment.data = redundant1->data;
free(addr0); free(buf0);
} else { } else {
environment.image = addr0; environment.image = buf0;
environment.crc = &redundant0->crc; environment.crc = &redundant0->crc;
environment.flags = &redundant0->flags; environment.flags = &redundant0->flags;
environment.data = redundant0->data; environment.data = redundant0->data;
free(addr1); free(buf1);
} }
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Selected env in %s\n", DEVNAME(dev_current)); fprintf(stderr, "Selected env in %s\n", DEVNAME(dev_current));
@ -1590,11 +1590,8 @@ int fw_env_open(struct env_opts *opts)
return 0; return 0;
open_cleanup: open_cleanup:
if (addr0) free(buf0);
free(addr0); free(buf1);
if (addr1)
free(addr1);
return ret; return ret;
} }