helper/log: remove dead code in log_forward()
Commit f1be0e6af2
("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>
log_output
parent
d5f82eea3d
commit
8f47a09cc5
|
@ -61,46 +61,16 @@ static const char * const log_strings[6] = {
|
||||||
|
|
||||||
static int count;
|
static int count;
|
||||||
|
|
||||||
static struct store_log_forward *log_head;
|
/* forward the log to the listeners */
|
||||||
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 */
|
|
||||||
static void log_forward(const char *file, unsigned line, const char *function, const char *string)
|
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;
|
||||||
struct log_callback *cb, *next;
|
cb = log_callbacks;
|
||||||
cb = log_callbacks;
|
/* DANGER!!!! the log callback can remove itself!!!! */
|
||||||
/* DANGER!!!! the log callback can remove itself!!!! */
|
while (cb) {
|
||||||
while (cb) {
|
next = cb->next;
|
||||||
next = cb->next;
|
cb->fn(cb->priv, file, line, function, string);
|
||||||
cb->fn(cb->priv, file, line, function, string);
|
cb = next;
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue