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>
/* 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. */
/* 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;
{
/* ensure returned length is always sane */
*len = 0;
fclose(pFile);
/* 0-byte after buffer (not included in *len) serves as a sentinel */
fclose(pFile);
/* 0-byte after buffer (not included in *len) serves as a sentinel */
- char *buf = (char *)*data;
- buf[*len] = 0;
/* NOTE!!! we only have line printing capability so we print the entire file as a single
* line. */
/* NOTE!!! we only have line printing capability so we print the entire file as a single
* line. */
size_t len;
int retval = loadFile(CMD_ARGV[0], &data, &len);
if (retval == ERROR_OK) {
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]);
free(data);
} else
command_print(CMD_CTX, "%s not found", CMD_ARGV[0]);
/* NOTE!!! we only have line printing capability so we print the entire file as a single
* line. */
/* NOTE!!! we only have line printing capability so we print the entire file as a single
* line. */
size_t len;
int retval = loadFile(CMD_ARGV[0], &data, &len);
size_t len;
int retval = loadFile(CMD_ARGV[0], &data, &len);
if (chunk > maxChunk)
chunk = maxChunk;
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)
retval = ERROR_COMMAND_SYNTAX_ERROR;
if (retval != ERROR_OK)
- char *name = (char *) Jim_GetString(argv[1], NULL);
+ const char *name = Jim_GetString(argv[1], NULL);
DIR *dirp = NULL;
dirp = opendir(name);
DIR *dirp = NULL;
dirp = opendir(name);