diff options
author | Antonio Borneo <borneo.antonio@gmail.com> | 2018-11-26 16:49:05 +0100 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2018-12-11 13:26:05 +0000 |
commit | 8f47a09cc55a1d2030b7d0df11668b6cb4f2a905 (patch) | |
tree | 523b71fafc34d386c4be816e5938b704bade4984 | |
parent | d5f82eea3d8f5a467bcbe40b43bf2daf74896984 (diff) | |
download | riscv-openocd-8f47a09cc55a1d2030b7d0df11668b6cb4f2a905.zip riscv-openocd-8f47a09cc55a1d2030b7d0df11668b6cb4f2a905.tar.gz riscv-openocd-8f47a09cc55a1d2030b7d0df11668b6cb4f2a905.tar.bz2 |
helper/log: remove dead code in log_forward()
Commit f1be0e6af2e204805a8bc2e8cadf828b9fa46c98 ("HELPER/LOG:
review unused symbols") removed a set of unused functions and,
as consequence, there is no code anymore that sets the variable
"log_forward_count". But, the commit above did not removed the
code (now dead) that depends on "log_forward_count" set.
Remove the code dependant on "log_forward_count" set and the
variable itself.
Change-Id: I6efe93d1dccbe13c409c5bc55ba47a2684c0e3ac
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4779
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r-- | src/helper/log.c | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/src/helper/log.c b/src/helper/log.c index c8a3a6c..f980774 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -61,46 +61,16 @@ static const char * const log_strings[6] = { static int count; -static struct store_log_forward *log_head; -static int log_forward_count; - -struct store_log_forward { - struct store_log_forward *next; - const char *file; - int line; - const char *function; - const char *string; -}; - -/* either forward the log to the listeners or store it for possible forwarding later */ +/* forward the log to the listeners */ static void log_forward(const char *file, unsigned line, const char *function, const char *string) { - if (log_forward_count == 0) { - struct log_callback *cb, *next; - cb = log_callbacks; - /* DANGER!!!! the log callback can remove itself!!!! */ - while (cb) { - next = cb->next; - cb->fn(cb->priv, file, line, function, string); - cb = next; - } - } else { - struct store_log_forward *log = malloc(sizeof(struct store_log_forward)); - log->file = strdup(file); - log->line = line; - log->function = strdup(function); - log->string = strdup(string); - log->next = NULL; - if (log_head == NULL) - log_head = log; - else { - /* append to tail */ - struct store_log_forward *t; - t = log_head; - while (t->next != NULL) - t = t->next; - t->next = log; - } + struct log_callback *cb, *next; + cb = log_callbacks; + /* DANGER!!!! the log callback can remove itself!!!! */ + while (cb) { + next = cb->next; + cb->fn(cb->priv, file, line, function, string); + cb = next; } } |