From c0aba07f1a4221e0aee10f7fddc47dde29e5282e Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 6 Aug 2013 19:30:05 +0200 Subject: sbtools: fix output printing The code used printf instead of the provided printf functions, resulting in strange output. Change-Id: I2c7c2531d8d54ecdea97e8c189d18d351320ca7d --- utils/imxtools/sbtools/misc.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'utils/imxtools/sbtools/misc.h') diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h index 8429e84..624cd5a 100644 --- a/utils/imxtools/sbtools/misc.h +++ b/utils/imxtools/sbtools/misc.h @@ -43,6 +43,10 @@ typedef struct crypto_key_t *key_array_t; int g_nr_keys; key_array_t g_key_array; +typedef void (*misc_printf_t)(void *user, const char *fmt, ...); + +void misc_std_printf(void *user, const char *fmt, ...); + void *memdup(const void *p, size_t len); void *augment_array(void *arr, size_t elem_sz, size_t cnt, void *aug, size_t aug_cnt); void augment_array_ex(void **arr, size_t elem_sz, int *cnt, int *capacity, @@ -50,14 +54,14 @@ void augment_array_ex(void **arr, size_t elem_sz, int *cnt, int *capacity, void generate_random_data(void *buf, size_t sz); void *xmalloc(size_t s); int convxdigit(char digit, byte *val); -void print_hex(byte *data, int len, bool newline); +void print_hex(void *user, misc_printf_t printf, byte *data, int len, bool newline); void add_keys(key_array_t ka, int kac); bool parse_key(char **str, struct crypto_key_t *key); bool add_keys_from_file(const char *key_file); -void print_key(struct crypto_key_t *key, bool newline); +void print_key(void *user, misc_printf_t printf, struct crypto_key_t *key, bool newline); void clear_keys(); -typedef char color_t[]; +typedef const char color_t[]; extern color_t OFF, GREY, RED, GREEN, YELLOW, BLUE; void color(color_t c); -- cgit v1.1