fileio_t -> struct fileio

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

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 2bde024e68fc05cdd0ea29e4a92226d4c8b4f025..3a62961142d7d6556d7c8416b60d352d0a201540 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-2008 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  *
@@ -57,8 +57,7 @@
 #endif
 
 
-int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
-               char **args, int argc)
+COMMAND_HANDLER(handle_rm_command)
 {
        if (argc != 1)
        {
@@ -134,10 +133,7 @@ int loadFile(const char *fileName, void **data, size_t *len)
        return ERROR_OK;
 }
 
-
-
-int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd,
-               char **args, int argc)
+COMMAND_HANDLER(handle_cat_command)
 {
        if (argc != 1)
        {
@@ -162,8 +158,8 @@ int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd,
 
        return ERROR_OK;
 }
-int handle_trunc_command(struct command_context_s *cmd_ctx, char *cmd,
-               char **args, int argc)
+
+COMMAND_HANDLER(handle_trunc_command)
 {
        if (argc != 1)
        {
@@ -179,8 +175,7 @@ int handle_trunc_command(struct command_context_s *cmd_ctx, char *cmd,
        return ERROR_OK;
 }
 
-
-int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_meminfo_command)
 {
        static int prev = 0;
        struct mallinfo info;
@@ -199,14 +194,13 @@ int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char **
        }
        prev = info.fordblks;
 
-       command_print(cmd_ctx, "Available ram:   %d", info.fordblks );
+       command_print(cmd_ctx, "Available ram:   %d", info.fordblks);
 
        return ERROR_OK;
 }
 
 
-int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
-               char **args, int argc)
+COMMAND_HANDLER(handle_append_command)
 {
        if (argc < 1)
        {
@@ -220,9 +214,9 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
        config_file = fopen(args[0], "a");
        if (config_file != NULL)
        {
-               int i;
                fseek(config_file, 0, SEEK_END);
 
+               unsigned i;
                for (i = 1; i < argc; i++)
                {
                        if (fwrite(args[i], 1, strlen(args[i]), config_file) != strlen(args[i]))
@@ -245,7 +239,7 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
 
 
 
-int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_cp_command)
 {
        if (argc != 2)
        {
@@ -325,34 +319,34 @@ void copyfile(char *name2, char *name1)
 
        fd1 = open(name1, O_WRONLY | O_CREAT, 0664);
        if (fd1 < 0)
-               SHOW_RESULT(open, fd1 );
+               SHOW_RESULT(open, fd1);
 
        fd2 = open(name2, O_RDONLY);
        if (fd2 < 0)
-               SHOW_RESULT(open, fd2 );
+               SHOW_RESULT(open, fd2);
 
        for (;;)
        {
-               done = read(fd2, buf, IOSIZE );
+               done = read(fd2, buf, IOSIZE);
                if (done < 0)
                {
-                       SHOW_RESULT(read, done );
+                       SHOW_RESULT(read, done);
                        break;
                }
 
-        if (done == 0 ) break;
+        if (done == 0) break;
 
                wrote = write(fd1, buf, done);
-        if (wrote != done ) SHOW_RESULT(write, wrote );
+        if (wrote != done) SHOW_RESULT(write, wrote);
 
-        if (wrote != done ) break;
+        if (wrote != done) break;
        }
 
        err = close(fd1);
-    if (err < 0 ) SHOW_RESULT(close, err );
+    if (err < 0) SHOW_RESULT(close, err);
 
        err = close(fd2);
-    if (err < 0 ) SHOW_RESULT(close, err );
+    if (err < 0) SHOW_RESULT(close, err);
 
 }
 
@@ -372,7 +366,7 @@ void copydir(char *name, char *destdir)
        }
 
        dirp = opendir(name);
-    if (dirp == NULL ) SHOW_RESULT(opendir, -1 );
+    if (dirp == NULL) SHOW_RESULT(opendir, -1);
 
        for (;;)
        {
@@ -421,7 +415,7 @@ void copydir(char *name, char *destdir)
        }
 
        err = closedir(dirp);
-    if (err < 0 ) SHOW_RESULT(stat, err );
+    if (err < 0) SHOW_RESULT(stat, err);
 }