diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-09-28 23:13:51 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-31 20:45:34 +0000 |
| commit | e6733049224ea7becbc4f0e82f2d75e6393712f1 (patch) | |
| tree | 1e04f6794b19a61a30275f667e0e56cdeb5c0a9c /src/helper | |
| parent | 01298ca2c839965f54d6d6a7b8ac00fe77190116 (diff) | |
| download | riscv-openocd-e6733049224ea7becbc4f0e82f2d75e6393712f1.zip riscv-openocd-e6733049224ea7becbc4f0e82f2d75e6393712f1.tar.gz riscv-openocd-e6733049224ea7becbc4f0e82f2d75e6393712f1.tar.bz2 | |
ioutil: Remove unnecessary casts and fix const-discarding
Using the right parameter type, there's no need to resort to casting.
Change-Id: I8aec852431ead26e24793fd6fac8781353963bf2
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1777
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Jens Bauer <jens@gpio.dk>
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/ioutil.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index ba7e215..5531900 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -53,7 +53,7 @@ /* loads a file and returns a pointer to it in memory. The file contains * a 0 byte(sentinel) after len bytes - the length of the file. */ -int loadFile(const char *fileName, void **data, size_t *len) +static int loadFile(const char *fileName, char **data, size_t *len) { /* ensure returned length is always sane */ *len = 0; @@ -98,8 +98,7 @@ int loadFile(const char *fileName, void **data, size_t *len) fclose(pFile); /* 0-byte after buffer (not included in *len) serves as a sentinel */ - char *buf = (char *)*data; - buf[*len] = 0; + (*data)[*len] = 0; return ERROR_OK; } @@ -111,12 +110,12 @@ COMMAND_HANDLER(handle_cat_command) /* NOTE!!! we only have line printing capability so we print the entire file as a single * line. */ - void *data; + char *data; size_t len; int retval = loadFile(CMD_ARGV[0], &data, &len); if (retval == ERROR_OK) { - command_print(CMD_CTX, "%s", (char *)data); + command_print(CMD_CTX, "%s", data); free(data); } else command_print(CMD_CTX, "%s not found", CMD_ARGV[0]); @@ -196,7 +195,7 @@ COMMAND_HANDLER(handle_cp_command) /* NOTE!!! we only have line printing capability so we print the entire file as a single * line. */ - void *data; + char *data; size_t len; int retval = loadFile(CMD_ARGV[0], &data, &len); @@ -214,7 +213,7 @@ COMMAND_HANDLER(handle_cp_command) if (chunk > maxChunk) chunk = maxChunk; - if ((retval == ERROR_OK) && (fwrite(((char *)data) + pos, 1, chunk, f) != chunk)) + if ((retval == ERROR_OK) && (fwrite(data + pos, 1, chunk, f) != chunk)) retval = ERROR_COMMAND_SYNTAX_ERROR; if (retval != ERROR_OK) @@ -378,7 +377,7 @@ static int ioutil_Jim_Command_ls(Jim_Interp *interp, return JIM_ERR; } - char *name = (char *) Jim_GetString(argv[1], NULL); + const char *name = Jim_GetString(argv[1], NULL); DIR *dirp = NULL; dirp = opendir(name); |