fix warning. Use %p for pointers

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

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 390eb0423501e037308480557931ba383ca0e97c..1b2f92610d95d2d23ea550d47f30e2270be5108d 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -51,8 +51,10 @@
 #include <ifaddrs.h>
 #endif
 #ifdef HAVE_MALLOC_H
+#if !BUILD_ECOSBOARD
 #include <malloc.h>
 #endif
+#endif
 //#ifdef HAVE_STRINGS_H
 //#include <strings.h>
 //#endif
@@ -153,7 +155,7 @@ int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd,
        int retval = loadFile(args[0], &data, &len);
        if (retval == ERROR_OK)
        {
-               command_print(cmd_ctx, "%s", data);
+               command_print(cmd_ctx, "%s", (char *)data);
                free(data);
        }
        else
@@ -216,6 +218,7 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
                return ERROR_INVALID_ARGUMENTS;
        }
 
+       int retval=ERROR_FAIL;
        FILE *config_file = NULL;
        config_file = fopen(args[0], "a");
        if (config_file != NULL)
@@ -225,17 +228,22 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
 
                for (i = 1; i < argc; i++)
                {
-                       fwrite(args[i], strlen(args[i]), 1, config_file);
+                       if (fwrite(args[i], strlen(args[i]), 1, config_file)!=strlen(args[i]))
+                               break;
                        if (i != argc - 1)
                        {
-                               fwrite(" ", 1, 1, config_file);
+                               if (fwrite(" ", 1, 1, config_file)!=1)
+                                       break;
                        }
                }
-               fwrite("\n", 1, 1, config_file);
+               if ((i==argc)&&(fwrite("\n", 1, 1, config_file)==1))
+               {
+                       retval=ERROR_OK;
+               }
                fclose(config_file);
        }
 
-       return ERROR_OK;
+       return retval;
 }
 
 
@@ -493,7 +501,7 @@ int handle_peek_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        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);
+       command_print(cmd_ctx, "0x%p : 0x%x", address, (int)value);
        return ERROR_OK;
 }