projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
binarybuffer: add API documentation
[fw/openocd]
/
src
/
helper
/
log.c
diff --git
a/src/helper/log.c
b/src/helper/log.c
index f68c9a3ee4bc7ab925641f4cc882e27d27fea031..5a65c87e5c8c8b25c2603313d40042a4e6bd697d 100644
(file)
--- a/
src/helper/log.c
+++ b/
src/helper/log.c
@@
-27,7
+27,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "log.h"
#include "time_support.h"
// @todo the inclusion of server.h here is a layering violation
#include "server.h"
#include "time_support.h"
// @todo the inclusion of server.h here is a layering violation
#include "server.h"
@@
-45,7
+44,7
@@
int debug_level = -1;
static FILE* log_output;
int debug_level = -1;
static FILE* log_output;
-static
log_callback_t
*log_callbacks = NULL;
+static
struct log_callback
*log_callbacks = NULL;
static long long last_time;
static long long current_time;
static long long last_time;
static long long current_time;
@@
-82,7
+81,7
@@
static void log_forward(const char *file, int line, const char *function, const
{
if (log_forward_count==0)
{
{
if (log_forward_count==0)
{
-
log_callback_t
*cb, *next;
+
struct log_callback
*cb, *next;
cb = log_callbacks;
/* DANGER!!!! the log callback can remove itself!!!! */
while (cb)
cb = log_callbacks;
/* DANGER!!!! the log callback can remove itself!!!! */
while (cb)
@@
-274,14
+273,12
@@
void log_printf_lf(enum log_levels level, const char *file, int line, const char
* 2: + INFORMATIONAL MSGS
* 3: + DEBUG MSGS
*/
* 2: + INFORMATIONAL MSGS
* 3: + DEBUG MSGS
*/
-
int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc
)
+
COMMAND_HANDLER(handle_debug_level_command
)
{
if (argc == 1)
{
unsigned new_level;
{
if (argc == 1)
{
unsigned new_level;
- int retval = parse_uint(args[0], &new_level);
- if (ERROR_OK != retval)
- return retval;
+ COMMAND_PARSE_NUMBER(uint, args[0], new_level);
debug_level = MIN(new_level, LOG_LVL_DEBUG);
}
else if (argc > 1)
debug_level = MIN(new_level, LOG_LVL_DEBUG);
}
else if (argc > 1)
@@
-304,7
+301,7
@@
int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha
return ERROR_OK;
}
return ERROR_OK;
}
-
int handle_log_output_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc
)
+
COMMAND_HANDLER(handle_log_output_command
)
{
if (argc == 1)
{
{
if (argc == 1)
{
@@
-319,7
+316,7
@@
int handle_log_output_command(struct command_context_s *cmd_ctx, char *cmd, char
return ERROR_OK;
}
return ERROR_OK;
}
-int log_register_commands(struct command_context
_s
*cmd_ctx)
+int log_register_commands(struct command_context *cmd_ctx)
{
start = timeval_ms();
register_command(cmd_ctx, NULL, "log_output", handle_log_output_command,
{
start = timeval_ms();
register_command(cmd_ctx, NULL, "log_output", handle_log_output_command,
@@
-330,7
+327,7
@@
int log_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK;
}
return ERROR_OK;
}
-int log_init(struct command_context
_s
*cmd_ctx)
+int log_init(struct command_context *cmd_ctx)
{
/* set defaults for daemon configuration, if not set by cmdline or cfgfile */
if (debug_level == -1)
{
/* set defaults for daemon configuration, if not set by cmdline or cfgfile */
if (debug_level == -1)
@@
-346,7
+343,7
@@
int log_init(struct command_context_s *cmd_ctx)
return ERROR_OK;
}
return ERROR_OK;
}
-int set_log_output(struct command_context
_s
*cmd_ctx, FILE *output)
+int set_log_output(struct command_context *cmd_ctx, FILE *output)
{
log_output = output;
return ERROR_OK;
{
log_output = output;
return ERROR_OK;
@@
-355,7
+352,7
@@
int set_log_output(struct command_context_s *cmd_ctx, FILE *output)
/* add/remove log callback handler */
int log_add_callback(log_callback_fn fn, void *priv)
{
/* add/remove log callback handler */
int log_add_callback(log_callback_fn fn, void *priv)
{
-
log_callback_t
*cb;
+
struct log_callback
*cb;
/* prevent the same callback to be registered more than once, just for sure */
for (cb = log_callbacks; cb; cb = cb->next)
/* prevent the same callback to be registered more than once, just for sure */
for (cb = log_callbacks; cb; cb = cb->next)
@@
-365,7
+362,7
@@
int log_add_callback(log_callback_fn fn, void *priv)
}
/* alloc memory, it is safe just to return in case of an error, no need for the caller to check this */
}
/* alloc memory, it is safe just to return in case of an error, no need for the caller to check this */
- if ((cb = malloc(sizeof(
log_callback_t
))) == NULL)
+ if ((cb = malloc(sizeof(
struct log_callback
))) == NULL)
return ERROR_BUF_TOO_SMALL;
/* add item to the beginning of the linked list */
return ERROR_BUF_TOO_SMALL;
/* add item to the beginning of the linked list */
@@
-379,7
+376,7
@@
int log_add_callback(log_callback_fn fn, void *priv)
int log_remove_callback(log_callback_fn fn, void *priv)
{
int log_remove_callback(log_callback_fn fn, void *priv)
{
-
log_callback_t
*cb, **p;
+
struct log_callback
*cb, **p;
for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
{
for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
{