michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: switch to cbprintf as basis for printf functionality

Browse source 
Replace use of z_prf with cbprintf.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-11-03 15:14:08 -06:00 • committed by Anas Nashif
commit ee0b32682a
1 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
subsys/logging/log_output.c
View file

@ -8,6 +8,7 @@
#include <logging/log_ctrl.h>
#include <logging/log.h>
#include <sys/__assert.h>
#include <sys/cbprintf.h>
#include <ctype.h>
#include <time.h>
#include <stdio.h>
@ -44,11 +45,6 @@ static const char *const colors[] = {
static uint32_t freq;
static uint32_t timestamp_div;
typedef int (*out_func_t)(int c, void *ctx);
extern int z_prf(int (*func)(), void *dest, char *format, va_list vargs);
extern void z_vprintk(out_func_t out, void *log_output,
const char *fmt, va_list ap);
extern void log_output_msg_syst_process(const struct log_output *log_output,
struct log_msg *msg, uint32_t flag);
extern void log_output_string_syst_process(const struct log_output *log_output,
@ -129,12 +125,7 @@ static int print_formatted(const struct log_output *log_output,
int length = 0;
va_start(args, fmt);
#if !defined(CONFIG_NEWLIB_LIBC) && !defined(CONFIG_ARCH_POSIX) && \
defined(CONFIG_LOG_ENABLE_FANCY_OUTPUT_FORMATTING)
length = z_prf(out_func, (void *)log_output, (char *)fmt, args);
#else
z_vprintk(out_func, (void *)log_output, fmt, args);
#endif
length = cbvprintf(out_func, (void *)log_output, fmt, args);
va_end(args);
return length;
@ -591,12 +582,7 @@ void log_output_string(const struct log_output *log_output,
level, domain_id, source_id);
}
#if !defined(CONFIG_NEWLIB_LIBC) && !defined(CONFIG_ARCH_POSIX) && \
defined(CONFIG_LOG_ENABLE_FANCY_OUTPUT_FORMATTING)
length = z_prf(out_func, (void *)log_output, (char *)fmt, ap);
#else
z_vprintk(out_func, (void *)log_output, fmt, ap);
#endif
length = cbvprintf(out_func, (void *)log_output, fmt, ap);
(void)length;