From 3d28c1418c11cb62e6c4c2f483a0bb7f308255a4 Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Wed, 11 Mar 2015 20:31:01 -0700 Subject: Cleaned up printf/scanf for C99 integer types. --- src/gdb_main.c | 16 ++++++++-------- src/include/general.h | 1 + src/platforms/libftdi/Makefile.inc | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gdb_main.c b/src/gdb_main.c index 17ad9a5..0c3dd77 100644 --- a/src/gdb_main.c +++ b/src/gdb_main.c @@ -85,8 +85,8 @@ gdb_main(void) case 'm': { /* 'm addr,len': Read len bytes from addr */ uint32_t addr, len; ERROR_IF_NO_TARGET(); - sscanf(pbuf, "m%08lx,%08lx", &addr, &len); - DEBUG("m packet: addr = %08lX, len = %08lX\n", addr, len); + sscanf(pbuf, "m%" SCNx32 ",%" SCNx32, &addr, &len); + DEBUG("m packet: addr = %" PRIx32 ", len = %" PRIx32 "\n", addr, len); uint8_t mem[len]; if(((addr & 3) == 0) && ((len & 3) == 0)) target_mem_read_words(cur_target, (void*)mem, addr, len); @@ -112,8 +112,8 @@ gdb_main(void) uint32_t addr, len; int hex; ERROR_IF_NO_TARGET(); - sscanf(pbuf, "M%08lx,%08lx:%n", &addr, &len, &hex); - DEBUG("M packet: addr = %08lX, len = %08lX\n", addr, len); + sscanf(pbuf, "M%" SCNx32 ",%" SCNx32 ":%n", &addr, &len, &hex); + DEBUG("M packet: addr = %" PRIx32 ", len = %" PRIx32 "\n", addr, len); uint8_t mem[len]; unhexify(mem, pbuf + hex, len); if(((addr & 3) == 0) && ((len & 3) == 0)) @@ -242,8 +242,8 @@ gdb_main(void) uint32_t addr, len; int bin; ERROR_IF_NO_TARGET(); - sscanf(pbuf, "X%08lx,%08lx:%n", &addr, &len, &bin); - DEBUG("X packet: addr = %08lX, len = %08lX\n", addr, len); + sscanf(pbuf, "X%" SCNx32 ",%" SCNx32 ":%n", &addr, &len, &bin); + DEBUG("X packet: addr = %" PRIx32 ", len = %" PRIx32 "\n", addr, len); if(((addr & 3) == 0) && ((len & 3) == 0)) target_mem_write_words(cur_target, addr, (void*)pbuf+bin, len); else @@ -352,7 +352,7 @@ handle_q_packet(char *packet, int len) return; } handle_q_string_reply(cur_target->tdesc, packet + 31); - } else if (sscanf(packet, "qCRC:%08lx,%08lx", &addr, &alen) == 2) { + } else if (sscanf(packet, "qCRC:%" PRIx32 ",%" PRIx32, &addr, &alen) == 2) { if(!cur_target) { gdb_putpacketz("E01"); return; @@ -454,7 +454,7 @@ handle_z_packet(char *packet, int plen) * with real sscanf() though... */ //sscanf(packet, "%*[zZ]%hhd,%08lX,%hhd", &type, &addr, &len); type = packet[1] - '0'; - sscanf(packet + 2, ",%08lx,%d", &addr, &len); + sscanf(packet + 2, ",%" PRIx32 ",%d", &addr, &len); switch(type) { case 1: /* Hardware breakpoint */ if(!cur_target->set_hw_bp) { /* Not supported */ diff --git a/src/include/general.h b/src/include/general.h index b4e9aeb..2cb4bd9 100644 --- a/src/include/general.h +++ b/src/include/general.h @@ -28,6 +28,7 @@ #include #include #include +#include #include "platform.h" #include "platform_support.h" diff --git a/src/platforms/libftdi/Makefile.inc b/src/platforms/libftdi/Makefile.inc index f7cc9c5..fa6292b 100644 --- a/src/platforms/libftdi/Makefile.inc +++ b/src/platforms/libftdi/Makefile.inc @@ -1,2 +1,2 @@ -CFLAGS += -DLIBFTDI -Wno-format +CFLAGS += -DLIBFTDI LDFLAGS += -lftdi -lusb -- cgit v1.2.3