Merge branch 'dsp5680xx_cherry' of git://repo.or.cz/openocd/dsp568013 into HEAD

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

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 14f6e91dbb4685de4c4be687d6380cc3dda2df67..211c4ba6c5d0d44e46a8ef3b75810e12ab7cfe4f 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
+ *   Copyright (C) 2007-2010 by Øyvind Harboe                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -65,19 +65,19 @@ int loadFile(const char *fileName, void **data, size_t *len)
        pFile = fopen(fileName,"rb");
        if (pFile == NULL)
        {
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                return ERROR_FAIL;
        }
        if (fseek(pFile, 0, SEEK_END) != 0)
        {
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                fclose(pFile);
                return ERROR_FAIL;
        }
        long fsize = ftell(pFile);
        if (fsize == -1)
        {
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                fclose(pFile);
                return ERROR_FAIL;
        }
@@ -85,14 +85,14 @@ int loadFile(const char *fileName, void **data, size_t *len)
 
        if (fseek(pFile, 0, SEEK_SET) != 0)
        {
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                fclose(pFile);
                return ERROR_FAIL;
        }
        *data = malloc(*len + 1);
        if (*data == NULL)
        {
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                fclose(pFile);
                return ERROR_FAIL;
        }
@@ -101,7 +101,7 @@ int loadFile(const char *fileName, void **data, size_t *len)
        {
                fclose(pFile);
                free(*data);
-               LOG_ERROR("Can't open %s\n", fileName);
+               LOG_ERROR("Can't open %s", fileName);
                return ERROR_FAIL;
        }
        fclose(pFile);
@@ -133,7 +133,7 @@ COMMAND_HANDLER(handle_cat_command)
        }
        else
        {
-               command_print(CMD_CTX, "%s not found %d", CMD_ARGV[0], retval);
+               command_print(CMD_CTX, "%s not found", CMD_ARGV[0]);
        }
 
        return ERROR_OK;
@@ -270,7 +270,7 @@ COMMAND_HANDLER(handle_cp_command)
                command_print(CMD_CTX, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
        } else
        {
-               command_print(CMD_CTX, "Failed: %d", retval);
+               command_print(CMD_CTX, "copy failed");
        }
 
        if (data != NULL)
@@ -418,7 +418,7 @@ COMMAND_HANDLER(handle_rm_command)
 
 
 static int
-zylinjtag_Jim_Command_ls(Jim_Interp *interp,
+ioutil_Jim_Command_ls(Jim_Interp *interp,
                                    int argc,
                Jim_Obj * const *argv)
 {
@@ -458,7 +458,7 @@ zylinjtag_Jim_Command_ls(Jim_Interp *interp,
 }
 
 static int
-zylinjtag_Jim_Command_peek(Jim_Interp *interp,
+ioutil_Jim_Command_peek(Jim_Interp *interp,
                                    int argc,
                Jim_Obj * const *argv)
 {
@@ -480,7 +480,7 @@ zylinjtag_Jim_Command_peek(Jim_Interp *interp,
 }
 
 static int
-zylinjtag_Jim_Command_poke(Jim_Interp *interp,
+ioutil_Jim_Command_poke(Jim_Interp *interp,
                                    int argc,
                Jim_Obj * const *argv)
 {
@@ -504,7 +504,7 @@ zylinjtag_Jim_Command_poke(Jim_Interp *interp,
 
 
 /* not so pretty code to fish out ip number*/
-static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
+static int ioutil_Jim_Command_ip(Jim_Interp *interp, int argc,
                Jim_Obj * const *argv)
 {
 #if !defined(__CYGWIN__)
@@ -551,7 +551,7 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
 }
 
 /* not so pretty code to fish out eth0 mac address */
-static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
+static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc,
                Jim_Obj * const *argv)
 {
 
@@ -661,10 +661,6 @@ static const struct command_registration ioutil_command_handlers[] = {
        },
 
        /*
-        * REVISIT shouldn't most, or all, these zylinjtag_*()
-        * entries be #ifdef ZY1000?  If not, why so they have
-        * those names?
-        *
         * Peek and poke are security holes -- they manipulate
         * server-internal addresses.
         */
@@ -673,33 +669,33 @@ static const struct command_registration ioutil_command_handlers[] = {
        {
                .name = "peek",
                .mode = COMMAND_ANY,
-               .jim_handler = zylinjtag_Jim_Command_peek,
+               .jim_handler = ioutil_Jim_Command_peek,
                .help = "peek at a memory address",
                .usage = "address",
        },
        {
                .name = "poke",
                .mode = COMMAND_ANY,
-               .jim_handler = zylinjtag_Jim_Command_poke,
+               .jim_handler = ioutil_Jim_Command_poke,
                .help = "poke at a memory address",
                .usage = "address value",
        },
        {
                .name = "ls",
                .mode = COMMAND_ANY,
-               .jim_handler = zylinjtag_Jim_Command_ls,
+               .jim_handler = ioutil_Jim_Command_ls,
                .help = "show a listing of files",
                .usage = "dirname",
        },
        {
                .name = "mac",
                .mode = COMMAND_ANY,
-               .jim_handler = zylinjtag_Jim_Command_mac,
+               .jim_handler = ioutil_Jim_Command_mac,
                .help = "show MAC address",
        },
        {
                .name = "ip",
-               .jim_handler = zylinjtag_Jim_Command_ip,
+               .jim_handler = ioutil_Jim_Command_ip,
                .mode = COMMAND_ANY,
                .help = "show IP address",
        },