- remove build warnings

git-svn-id: svn://svn.berlios.de/openocd/trunk@348 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 9b9c18160b87ebdbdc8c0abfc9bc0db4c14f374b..abbcbfcb0bc9f5ae43d927fe1a25bbafa13a80f7 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -36,7 +36,6 @@ static char** config_file_names;
 static size_t num_script_dirs;
 static char** script_search_dirs;
 
-
 void add_script_search_dir (const char *dir)
 {
        num_script_dirs++;
@@ -87,7 +86,6 @@ FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode)
 int parse_config_file(struct command_context_s *cmd_ctx)
 {
        char **cfg;
-       FILE *config_file;
 
        if (!config_file_names)
                add_config_file_name ("script openocd.cfg");

diff --git a/src/helper/configuration.h b/src/helper/configuration.h
index ec6e5539400ed0980db0ac0027fda824420cb580..f4aa8c0a015eabbfa7a495ac10fe329c640bb5af 100644 (file)
--- a/src/helper/configuration.h
+++ b/src/helper/configuration.h
@@ -25,6 +25,8 @@
 
 extern int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]);
 extern int parse_config_file(struct command_context_s *cmd_ctx);
+extern void add_config_file_name (const char *cfg);
+extern void add_script_search_dir (const char *dir);
 extern int configuration_output_handler(struct command_context_s *context, char* line);
 extern FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode);
 

diff --git a/src/helper/log.c b/src/helper/log.c
index 861e4b376859823413491f31b1ff62ffc2c2ceff..a5432aa9c53756d889240aa783ad9808ccb911c0 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -197,7 +197,7 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 {
        log_callback_t *cb, **p;
 
-       for (p = &log_callbacks; cb = *p; p = &(*p)->next)
+       for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
        {
            if (cb->fn == fn && cb->priv == priv)
            {

diff --git a/src/helper/options.c b/src/helper/options.c
index 89bf1f9b24e32530f839a1af29c0337d78d33aaa..30dad17dd8ae2963a9e16dca2076ca8f02ed27e8 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -31,7 +31,6 @@
 #include <getopt.h>
 #include <string.h>
 
-
 static int help_flag;
 
 static struct option long_options[] =
@@ -47,8 +46,6 @@ static struct option long_options[] =
        {0, 0, 0, 0}
 };
 
-
-
 int configuration_output_handler(struct command_context_s *context, char* line)
 {
        INFO(line);
@@ -56,7 +53,6 @@ int configuration_output_handler(struct command_context_s *context, char* line)
        return ERROR_OK;
 }
 
-
 int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
 {
        int c;

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 600fe19a0c67f48213499b09c2cf20303bcf7ade..5ec8297d246f565fb3836bb9a67c443d0edf80c2 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1351,7 +1351,7 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
 
 int jtag_init(struct command_context_s *cmd_ctx)
 {
-       int i, validate_tries = 0;
+       int validate_tries = 0;
        jtag_device_t *device;
 
        DEBUG("-");

diff --git a/src/server/server.c b/src/server/server.c
index 6aa72b92b1508266c4b06837a30a0493a52dfa58..4e8ddc692e6b861f204d43d7680487880e157607 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -88,7 +88,7 @@ int remove_connection(service_t *service, connection_t *connection)
        connection_t *c;
        
        /* find connection */
-       while(c = *p)
+       while((c = *p))
        {               
                if (c->fd == connection->fd)
                {       
@@ -170,7 +170,7 @@ int remove_service(unsigned short port)
        service_t *c;
        
        /* find service */
-       while(c = *p)
+       while((c = *p))
        {               
                if (c->port == port)
                {