diff options
author | Antonio Borneo <borneo.antonio@gmail.com> | 2021-07-03 18:51:20 +0200 |
---|---|---|
committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-07-24 10:37:49 +0100 |
commit | 08ee7bb982b16742f52cfdc6c649d82ffa2eb177 (patch) | |
tree | a824d376b774499303f00cffb201e35b01830d98 /src/flash/nand | |
parent | b159f5cdedd70fff9309722e927be670845f4df5 (diff) | |
download | riscv-openocd-08ee7bb982b16742f52cfdc6c649d82ffa2eb177.zip riscv-openocd-08ee7bb982b16742f52cfdc6c649d82ffa2eb177.tar.gz riscv-openocd-08ee7bb982b16742f52cfdc6c649d82ffa2eb177.tar.bz2 |
openocd: fix simple cases of NULL comparison
There are more than 1000 NULL comparisons to be aligned to the
coding style.
For recurrent NULL comparison it's preferable using trivial
scripts in order to minimize the review effort.
Patch generated automatically with the command:
sed -i PATTERN $(find src/ -type f)
where PATTERN is in the list:
's/(\([a-z][a-z0-9_]*\) == NULL)/(!\1)/g'
's/(\([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\) == NULL)/(!\1)/g'
's/(\([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\) == NULL)/(!\1)/g'
's/(\([a-z][a-z0-9_]*\) != NULL)/(\1)/g'
's/(\([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\) != NULL)/(\1)/g'
's/(\([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\) != NULL)/(\1)/g'
's/(NULL == \([a-z][a-z0-9_]*\))/(!\1)/g'
's/(NULL == \([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\))/(!\1)/g'
's/(NULL == \([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\))/(!\1)/g'
's/(NULL != \([a-z][a-z0-9_]*\))/(\1)/g'
's/(NULL != \([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\))/(\1)/g'
's/(NULL != \([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\))/(\1)/g'
Change-Id: Ida103e325d6d0600fb69c0b7a1557ee969db4417
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6350
Tested-by: jenkins
Diffstat (limited to 'src/flash/nand')
-rw-r--r-- | src/flash/nand/davinci.c | 2 | ||||
-rw-r--r-- | src/flash/nand/fileio.c | 8 | ||||
-rw-r--r-- | src/flash/nand/mx3.c | 2 | ||||
-rw-r--r-- | src/flash/nand/mxc.c | 2 | ||||
-rw-r--r-- | src/flash/nand/s3c24xx.c | 2 | ||||
-rw-r--r-- | src/flash/nand/tcl.c | 16 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c index 167b401..84f8e34 100644 --- a/src/flash/nand/davinci.c +++ b/src/flash/nand/davinci.c @@ -731,7 +731,7 @@ NAND_DEVICE_COMMAND_HANDLER(davinci_nand_device_command) } info = calloc(1, sizeof(*info)); - if (info == NULL) + if (!info) goto fail; info->eccmode = eccmode; diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c index 5504841..49db112 100644 --- a/src/flash/nand/fileio.c +++ b/src/flash/nand/fileio.c @@ -65,7 +65,7 @@ int nand_fileio_start(struct command_invocation *cmd, duration_start(&state->bench); - if (NULL != filename) { + if (filename) { int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY); if (retval != ERROR_OK) { const char *msg = (filemode == FILEIO_READ) ? "read" : "write"; @@ -127,7 +127,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state, if (retval != ERROR_OK) return retval; - if (NULL == nand->device) { + if (!nand->device) { command_print(CMD, "#%s: not probed", CMD_ARGV[0]); return ERROR_NAND_DEVICE_NOT_PROBED; } @@ -184,7 +184,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s) size_t total_read = 0; size_t one_read; - if (NULL != s->page) { + if (s->page) { fileio_read(s->fileio, s->page_size, s->page, &one_read); if (one_read < s->page_size) memset(s->page + one_read, 0xff, s->page_size - one_read); @@ -213,7 +213,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s) nand_calculate_ecc_kw(nand, s->page + i, ecc); ecc += 10; } - } else if (NULL != s->oob) { + } else if (s->oob) { fileio_read(s->fileio, s->oob_size, s->oob, &one_read); if (one_read < s->oob_size) memset(s->oob + one_read, 0xff, s->oob_size - one_read); diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c index b9f5ff1..dc8d619 100644 --- a/src/flash/nand/mx3.c +++ b/src/flash/nand/mx3.c @@ -64,7 +64,7 @@ NAND_DEVICE_COMMAND_HANDLER(imx31_nand_device_command) { struct mx3_nf_controller *mx3_nf_info; mx3_nf_info = malloc(sizeof(struct mx3_nf_controller)); - if (mx3_nf_info == NULL) { + if (!mx3_nf_info) { LOG_ERROR("no memory for nand controller"); return ERROR_FAIL; } diff --git a/src/flash/nand/mxc.c b/src/flash/nand/mxc.c index 1fe7d30..7aac721 100644 --- a/src/flash/nand/mxc.c +++ b/src/flash/nand/mxc.c @@ -89,7 +89,7 @@ NAND_DEVICE_COMMAND_HANDLER(mxc_nand_device_command) int hwecc_needed; mxc_nf_info = malloc(sizeof(struct mxc_nf_controller)); - if (mxc_nf_info == NULL) { + if (!mxc_nf_info) { LOG_ERROR("no memory for nand controller"); return ERROR_FAIL; } diff --git a/src/flash/nand/s3c24xx.c b/src/flash/nand/s3c24xx.c index ae3f137..c0471ed 100644 --- a/src/flash/nand/s3c24xx.c +++ b/src/flash/nand/s3c24xx.c @@ -34,7 +34,7 @@ S3C24XX_DEVICE_COMMAND() struct s3c24xx_nand_controller *s3c24xx_info; s3c24xx_info = malloc(sizeof(struct s3c24xx_nand_controller)); - if (s3c24xx_info == NULL) { + if (!s3c24xx_info) { LOG_ERROR("no memory for nand controller"); return -ENOMEM; } diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c index cbc51b8..6707314 100644 --- a/src/flash/nand/tcl.c +++ b/src/flash/nand/tcl.c @@ -86,7 +86,7 @@ COMMAND_HANDLER(handle_nand_info_command) if (retval != ERROR_OK) return retval; - if (NULL == p->device) { + if (!p->device) { command_print(CMD, "#%s: not probed", CMD_ARGV[0]); return ERROR_OK; } @@ -359,10 +359,10 @@ COMMAND_HANDLER(handle_nand_dump_command) return retval; } - if (NULL != s.page) + if (s.page) fileio_write(s.fileio, s.page_size, s.page, &size_written); - if (NULL != s.oob) + if (s.oob) fileio_write(s.fileio, s.oob_size, s.oob, &size_written); s.size -= nand->page_size; @@ -391,7 +391,7 @@ COMMAND_HANDLER(handle_nand_raw_access_command) if (retval != ERROR_OK) return retval; - if (NULL == p->device) { + if (!p->device) { command_print(CMD, "#%s: not probed", CMD_ARGV[0]); return ERROR_OK; } @@ -527,14 +527,14 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name, return ERROR_COMMAND_ARGUMENT_INVALID; } - if (NULL != controller->commands) { + if (controller->commands) { retval = register_commands(CMD_CTX, NULL, controller->commands); if (retval != ERROR_OK) return retval; } c = malloc(sizeof(struct nand_device)); - if (c == NULL) { + if (!c) { LOG_ERROR("End of memory"); return ERROR_FAIL; } @@ -560,7 +560,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name, return retval; } - if (controller->usage == NULL) + if (!controller->usage) LOG_DEBUG("'%s' driver usage field missing", controller->name); nand_device_add(c); @@ -580,7 +580,7 @@ COMMAND_HANDLER(handle_nand_device_command) const char *driver_name = CMD_ARGV[0]; struct nand_flash_controller *controller; controller = nand_driver_find_by_name(CMD_ARGV[0]); - if (NULL == controller) { + if (!controller) { LOG_ERROR("No valid NAND flash driver found (%s)", driver_name); return CALL_COMMAND_HANDLER(handle_nand_list_drivers); } |