Fix typo from hurrying the last commit. Nothing to see here.

[openocd.git] / src / helper / ioutil.c

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 4711e341f7dd26896347a89cb68ce9085138b48d..8fdbb2b66facff436898270543b9a5da3defb826 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -89,8 +89,11 @@ int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
 
 /* 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, int *len)
+int loadFile(const char *fileName, void **data, size_t *len)
 {
+       // ensure returned length is always sane
+       *len = 0;
+
        FILE * pFile;
        pFile = fopen(fileName,"rb");
        if (pFile==NULL)
@@ -104,13 +107,14 @@ int loadFile(const char *fileName, void **data, int *len)
                fclose(pFile);
                return ERROR_FAIL;
        }
-       *len=ftell(pFile);
-       if (*len==-1)
+       long fsize = ftell(pFile);
+       if (fsize == -1)
        {
                LOG_ERROR("Can't open %s\n", fileName);
                fclose(pFile);
                return ERROR_FAIL;
        }
+       *len = fsize;
 
        if (fseek(pFile, 0, SEEK_SET)!=0)
        {
@@ -118,7 +122,7 @@ int loadFile(const char *fileName, void **data, int *len)
                fclose(pFile);
                return ERROR_FAIL;
        }
-       *data=malloc(*len+1);
+       *data = malloc(*len + 1);
        if (*data==NULL)
        {
                LOG_ERROR("Can't open %s\n", fileName);
@@ -134,12 +138,12 @@ int loadFile(const char *fileName, void **data, int *len)
                return ERROR_FAIL;
        }
        fclose(pFile);
-       *(((char *)(*data))+*len)=0; /* sentinel */
-
-       return ERROR_OK;
-
 
+       // 0-byte after buffer (not included in *len) serves as a sentinel
+       char *buf = (char *)*data;
+       buf[*len] = 0;
 
+       return ERROR_OK;
 }
 
 
@@ -155,7 +159,7 @@ int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd,
 
        // NOTE!!! we only have line printing capability so we print the entire file as a single line.
        void *data;
-       int len;
+       size_t len;
 
        int retval = loadFile(args[0], &data, &len);
        if (retval == ERROR_OK)
@@ -256,7 +260,7 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
 
        // NOTE!!! we only have line printing capability so we print the entire file as a single line.
        void *data;
-       int len;
+       size_t len;
 
        int retval = loadFile(args[0], &data, &len);
        if (retval != ERROR_OK)
@@ -266,11 +270,11 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
        if (f == NULL)
                retval = ERROR_INVALID_ARGUMENTS;
 
-       int pos = 0;
+       size_t pos = 0;
        for (;;)
        {
-               int chunk = len - pos;
-               static const int maxChunk = 512 * 1024; // ~1/sec
+               size_t chunk = len - pos;
+               static const size_t maxChunk = 512 * 1024; // ~1/sec
                if (chunk > maxChunk)
                {
                        chunk = maxChunk;
@@ -497,8 +501,9 @@ int handle_peek_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
-       int value=*address;
+       unsigned long addr = strtoul(args[0], NULL, 0);
+       volatile unsigned *address = (volatile unsigned *)addr;
+       unsigned value = *address;
        command_print(cmd_ctx, "0x%x : 0x%x", address, value);
        return ERROR_OK;
 }
@@ -509,7 +514,8 @@ int handle_poke_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        {
                return ERROR_INVALID_ARGUMENTS;
        }
-       volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
+       unsigned long addr = strtoul(args[0], NULL, 0);
+       volatile int *address = (volatile int *)addr;
        int value=strtoul(args[1], NULL, 0);
        *address=value;
        return ERROR_OK;
@@ -601,6 +607,7 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
        freeifaddrs(ifp);
 #else
        Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0);
+       LOG_ERROR("NOT IMPLEMENTED!!!");
 #endif
        Jim_SetResult(interp, tclOutput);