build: cleanup src/ directory

Change-Id: Ia6ed99ce75625ad6ef5e0d3c3bbdc1c1bec21df3
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/407
Tested-by: jenkins

diff --git a/src/hello.c b/src/hello.c
index 6584aa20db612dcca11c774f97ee5112f6651e40..903123c492588983a24dd3b1028935884fd1c936 100644 (file)
--- a/src/hello.c
+++ b/src/hello.c
@@ -25,16 +25,13 @@
 COMMAND_HANDLER(handle_foo_command)
 {
        if (CMD_ARGC < 1 || CMD_ARGC > 2)
 COMMAND_HANDLER(handle_foo_command)
 {
        if (CMD_ARGC < 1 || CMD_ARGC > 2)

-       {

                return ERROR_COMMAND_SYNTAX_ERROR;
                return ERROR_COMMAND_SYNTAX_ERROR;

-       }

 
        uint32_t address;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
        const char *msg = "<unchanged>";
 
        uint32_t address;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
        const char *msg = "<unchanged>";

-       if (CMD_ARGC == 2)
-       {
+       if (CMD_ARGC == 2) {

                bool enable;
                COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
                msg = enable ? "enable" : "disable";
                bool enable;
                COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
                msg = enable ? "enable" : "disable";


@@ -49,7 +46,7 @@ static bool foo_flag;
 COMMAND_HANDLER(handle_flag_command)
 {
        return CALL_COMMAND_HANDLER(handle_command_parse_bool,
 COMMAND_HANDLER(handle_flag_command)
 {
        return CALL_COMMAND_HANDLER(handle_command_parse_bool,

-                       &foo_flag, "foo flag");
+               &foo_flag, "foo flag");

 }
 
 static const struct command_registration foo_command_handlers[] = {
 }
 
 static const struct command_registration foo_command_handlers[] = {


@@ -80,15 +77,11 @@ static const struct command_registration foo_command_handlers[] = {
 static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 {
        if (CMD_ARGC > 1)
 static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 {
        if (CMD_ARGC > 1)

-       {

                return ERROR_COMMAND_SYNTAX_ERROR;
                return ERROR_COMMAND_SYNTAX_ERROR;

-       }
-       if (1 == CMD_ARGC)
-       {
+       if (1 == CMD_ARGC) {

                *sep = " ";
                *name = CMD_ARGV[0];
                *sep = " ";
                *name = CMD_ARGV[0];

-       }
-       else
+       } else

                *sep = *name = "";
 
        return ERROR_OK;
                *sep = *name = "";
 
        return ERROR_OK;

diff --git a/src/hello.h b/src/hello.h
index f41c67a3cab2db34635122917066e7585e6e1094..319faa30df4841857e5c0178d5070d98bf692234 100644 (file)
--- a/src/hello.h
+++ b/src/hello.h
@@ -28,4 +28,4 @@ struct command_registration;
  */
 extern const struct command_registration hello_command_handlers[];
 
  */
 extern const struct command_registration hello_command_handlers[];
 

-#endif // OPENOCD_HELLO_H
+#endif /* OPENOCD_HELLO_H */

diff --git a/src/main.c b/src/main.c
index 9c7191d6e3e4e34daf1e13230d8cee3c48f6f01e..2585c663cb0d16d226921d950547a231d3b03ced 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/src/openocd.c b/src/openocd.c
index 60cbf232a61d1c8e68f006a2d5c3dc2606791149..048ce8524809e319579a68f163cec12bdb829b0e 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -47,38 +47,35 @@
 #include <strings.h>
 #endif
 
 #include <strings.h>
 #endif
 

-#define OPENOCD_VERSION \
-               "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#define OPENOCD_VERSION        \
+       "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"

 
 /* Give scripts and TELNET a way to find out what version this is */
 static int jim_version_command(Jim_Interp *interp, int argc,
 
 /* Give scripts and TELNET a way to find out what version this is */
 static int jim_version_command(Jim_Interp *interp, int argc,

-               Jim_Obj * const *argv)
+       Jim_Obj * const *argv)

 {
        if (argc > 2)
 {
        if (argc > 2)

-       {

                return JIM_ERR;
                return JIM_ERR;

-       }

        const char *str = "";
        const char *str = "";

-       char * version_str;
+       char *version_str;

        version_str = OPENOCD_VERSION;
 
        if (argc == 2)
                str = Jim_GetString(argv[1], NULL);
 
        if (strcmp("git", str) == 0)
        version_str = OPENOCD_VERSION;
 
        if (argc == 2)
                str = Jim_GetString(argv[1], NULL);
 
        if (strcmp("git", str) == 0)

-       {

                version_str = GITVERSION;
                version_str = GITVERSION;

-       }

 
        Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
 
        return JIM_OK;
 }
 
 
        Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
 
        return JIM_OK;
 }
 

-static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
+static int log_target_callback_event_handler(struct target *target,
+       enum target_event event,
+       void *priv)

 {
 {

-       switch (event)
-       {
+       switch (event) {

                case TARGET_EVENT_GDB_START:
                        target->display = 0;
                        break;
                case TARGET_EVENT_GDB_START:
                        target->display = 0;
                        break;


@@ -86,8 +83,7 @@ static int log_target_callback_event_handler(struct target *target, enum target_
                        target->display = 1;
                        break;
                case TARGET_EVENT_HALTED:
                        target->display = 1;
                        break;
                case TARGET_EVENT_HALTED:

-                       if (target->display)
-                       {
+                       if (target->display) {

                                /* do not display information when debugger caused the halt */
                                target_arch_state(target);
                        }
                                /* do not display information when debugger caused the halt */
                                target_arch_state(target);
                        }


@@ -117,7 +113,7 @@ COMMAND_HANDLER(handle_init_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int retval;
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int retval;

-       static int initialized = 0;
+       static int initialized;

        if (initialized)
                return ERROR_OK;
 
        if (initialized)
                return ERROR_OK;
 


@@ -127,8 +123,8 @@ COMMAND_HANDLER(handle_init_command)
        if (ERROR_OK != retval)
                return ERROR_FAIL;
 
        if (ERROR_OK != retval)
                return ERROR_FAIL;
 

-       if ((retval = adapter_init(CMD_CTX)) != ERROR_OK)
-       {
+       retval = adapter_init(CMD_CTX);
+       if (retval != ERROR_OK) {

                /* we must be able to set up the debug adapter */
                return retval;
        }
                /* we must be able to set up the debug adapter */
                return retval;
        }


@@ -251,11 +247,9 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
                &mflash_register_commands,
                NULL
        };
                &mflash_register_commands,
                NULL
        };

-       for (unsigned i = 0; NULL != command_registrants[i]; i++)
-       {
+       for (unsigned i = 0; NULL != command_registrants[i]; i++) {

                int retval = (*command_registrants[i])(cmd_ctx);
                int retval = (*command_registrants[i])(cmd_ctx);

-               if (ERROR_OK != retval)
-               {
+               if (ERROR_OK != retval) {

                        command_done(cmd_ctx);
                        return NULL;
                }
                        command_done(cmd_ctx);
                        return NULL;
                }


@@ -263,7 +257,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
        LOG_DEBUG("command registration: complete");
 
        LOG_OUTPUT(OPENOCD_VERSION "\n"
        LOG_DEBUG("command registration: complete");
 
        LOG_OUTPUT(OPENOCD_VERSION "\n"

-                       "Licensed under GNU GPL v2\n");
+               "Licensed under GNU GPL v2\n");

 
        global_cmd_ctx = cmd_ctx;
 
 
        global_cmd_ctx = cmd_ctx;
 


@@ -292,8 +286,7 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
        if (ERROR_OK != ret)
                return EXIT_FAILURE;
 
        if (ERROR_OK != ret)
                return EXIT_FAILURE;
 

-       if (init_at_startup)
-       {
+       if (init_at_startup) {

                ret = command_run_line(cmd_ctx, "init");
                if (ERROR_OK != ret)
                        return EXIT_FAILURE;
                ret = command_run_line(cmd_ctx, "init");
                if (ERROR_OK != ret)
                        return EXIT_FAILURE;

diff --git a/src/openocd.h b/src/openocd.h
index e43f156fcbf5a58219af15a9d78c037ee666d330..80331157c12836a28992520e1beb38b6032eb250 100644 (file)
--- a/src/openocd.h
+++ b/src/openocd.h
@@ -21,7 +21,7 @@
 #ifndef OPENOCD_H
 #define OPENOCD_H
 
 #ifndef OPENOCD_H
 #define OPENOCD_H
 

-/** 
+/**

  * Different applications can define this entry point to override
  * the default openocd main function.  On most systems, this will be
  * defined in src/openocd.c.
  * Different applications can define this entry point to override
  * the default openocd main function.  On most systems, this will be
  * defined in src/openocd.c.


@@ -31,7 +31,7 @@
  */
 int openocd_main(int argc, char *argv[]);
 
  */
 int openocd_main(int argc, char *argv[]);
 

-/// provides a hard-coded command environment setup
+/** provides a hard-coded command environment setup */

 extern const char openocd_startup_tcl[];
 
 #endif
 extern const char openocd_startup_tcl[];
 
 #endif