From f30df2c19d38f8e09a7cd782f5049edc2ca34dde Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Mon, 12 Mar 2018 19:01:54 +0800 Subject: [PATCH] Add print format for size_t, fix warns --- libr/core/cmd_print.c | 4 +--- libr/debug/p/native/linux/linux_coredump.c | 4 ++-- libr/include/r_types.h | 8 ++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libr/core/cmd_print.c b/libr/core/cmd_print.c index 4df09a3aa7..58e03228cc 100644 --- a/libr/core/cmd_print.c +++ b/libr/core/cmd_print.c @@ -2980,12 +2980,10 @@ r_cons_printf ("base:\n"); #endif } static void disasm_recursive(RCore *core, ut64 addr, char type_print) { - bool push[512]; RAnalOp aop = {0}; - int i, j, ret; + int ret; ut8 buf[128]; int count = 64; // must be user-defined - int base = 0; while (count-- > 0) { r_io_read_at (core->io, addr, buf, sizeof (buf)); r_anal_op_fini (&aop); diff --git a/libr/debug/p/native/linux/linux_coredump.c b/libr/debug/p/native/linux/linux_coredump.c index cba031e2a6..ff9f1e9425 100644 --- a/libr/debug/p/native/linux/linux_coredump.c +++ b/libr/debug/p/native/linux/linux_coredump.c @@ -649,7 +649,7 @@ static int get_info_mappings(linux_map_entry_t *me_head, size_t *maps_size) { int n_entries; for (n_entries = 0, p = me_head; p; p = p->n) { /* We don't count maps which does not have r/w perms */ - if ((p->perms & R_IO_READ) || (p->perms & R_IO_WRITE) && p->dumpeable) { + if (((p->perms & R_IO_READ) || (p->perms & R_IO_WRITE)) && p->dumpeable) { *maps_size += p->end_addr - p->start_addr; n_entries++; } @@ -769,7 +769,7 @@ static bool dump_elf_map_content(RDebug *dbg, RBuffer *dest, linux_map_entry_t * } ret = dbg->iob.read_at (dbg->iob.io, p->start_addr, map_content, size); if (!ret) { - eprintf ("Problems reading %d bytes at %"PFMT64x"\n", size, p->start_addr); + eprintf ("Problems reading %"PFMTSZd" bytes at %"PFMT64x"\n", size, p->start_addr); } else { ret = r_buf_append_bytes (dest, (const ut8*)map_content, size); if (!ret) { diff --git a/libr/include/r_types.h b/libr/include/r_types.h index 4758c37f9f..94535e4015 100644 --- a/libr/include/r_types.h +++ b/libr/include/r_types.h @@ -354,6 +354,10 @@ static inline void *r_new_copy(int size, void *data) { #define PFMT64d "I64d" #define PFMT64u "I64u" #define PFMT64o "I64o" +#define PFMTSZx "Ix" +#define PFMTSZd "Id" +#define PFMTSZu "Iu" +#define PFMTSZo "Io" #define LDBLFMT "f" #define HHXFMT "x" #else @@ -361,6 +365,10 @@ static inline void *r_new_copy(int size, void *data) { #define PFMT64d "lld" #define PFMT64u "llu" #define PFMT64o "llo" +#define PFMTSZx "zx" +#define PFMTSZd "zd" +#define PFMTSZu "zu" +#define PFMTSZo "zo" #define LDBLFMT "Lf" #define HHXFMT "hhx" #endif