From 4af8c4e1858660fb45f336cc6cfc8e72fa2e2be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 11 Apr 2011 15:01:51 +0200 Subject: [PATCH 2/2] printf formatting fixes --- src/rtos/rtos.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 5d130c5..6dc8fd3 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -142,7 +142,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char unsigned long mode; threadid_t threadid = 0; struct thread_detail* detail; - sscanf(packet, "qP%8lx%16I64x", &mode, &threadid); + sscanf(packet, "qP%8lx%16llx", &mode, &threadid); int found = -1; @@ -186,23 +186,23 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char char thread_str[1000]; sprintf(thread_str, "%08lx", mode); - sprintf(thread_str, "%016I64x", threadid); + sprintf(thread_str, "%016llx", threadid); if (mode & TAG_THREADID) { - sprintf(thread_str, "%08lx10%016I64x", TAG_THREADID, threadid); + sprintf(thread_str, "%08x10%016llx", TAG_THREADID, threadid); } if (mode & TAG_EXISTS) { - sprintf(thread_str, "%08lx08%08lx", TAG_EXISTS, (detail->exists==true)?1:0); + sprintf(thread_str, "%08x08%08x", TAG_EXISTS, (detail->exists==true)?1:0); } if (mode & TAG_DISPLAY) { - sprintf(thread_str, "%08lx%02x%s", TAG_DISPLAY, (unsigned char)strlen(detail->display_str), detail->display_str ); + sprintf(thread_str, "%08x%02x%s", TAG_DISPLAY, (unsigned char)strlen(detail->display_str), detail->display_str ); } if (mode & TAG_MOREDISPLAY) { - sprintf(thread_str, "%08lx%02x%s", TAG_MOREDISPLAY, (unsigned char)strlen(detail->extra_info_str), detail->extra_info_str ); + sprintf(thread_str, "%08x%02x%s", TAG_MOREDISPLAY, (unsigned char)strlen(detail->extra_info_str), detail->extra_info_str ); } if (mode & TAG_THREADNAME) { - sprintf(thread_str, "%08lx%02x%s", TAG_THREADNAME, (unsigned char)strlen(detail->thread_name_str), detail->thread_name_str ); + sprintf(thread_str, "%08x%02x%s", TAG_THREADNAME, (unsigned char)strlen(detail->thread_name_str), detail->thread_name_str ); } //gdb_put_packet(connection, tmpstr, sizeof(tmpstr)-1); @@ -218,7 +218,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char { threadid_t threadid = 0; int found = -1; - sscanf(packet, "qThreadExtraInfo,%I64x", &threadid ); + sscanf(packet, "qThreadExtraInfo,%llx", &threadid ); if ((target->rtos != NULL) && (target->rtos->thread_details != NULL)) { @@ -315,7 +315,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char int numconv; if (0 == found ) { - numconv =sscanf(packet, "qSymbol:%I64x:%s", &value, hex_name_str); + numconv =sscanf(packet, "qSymbol:%llx:%s", &value, hex_name_str); } else { @@ -420,7 +420,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char if (i != 0) { tmp_str += sprintf(tmp_str, ","); } - tmp_str += sprintf(tmp_str, "%016I64x", + tmp_str += sprintf(tmp_str, "%016llx", target->rtos->thread_details[i].threadid); } tmp_str[0] = 0; @@ -458,7 +458,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char { threadid_t threadid; int found = -1; - sscanf(packet, "T%I64x", &threadid); + sscanf(packet, "T%llx", &threadid); if ((target->rtos != NULL) && (target->rtos->thread_details != NULL)) { int thread_num; @@ -482,7 +482,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char { if (packet[1] == 'g') { - sscanf(packet, "Hg%16I64x", ¤t_threadid); + sscanf(packet, "Hg%16llx", ¤t_threadid); } gdb_put_packet(connection, "OK", 2); } @@ -638,7 +638,7 @@ static void hex_to_str( char* dst, char * hex_src ) static int str_to_hex( char* hex_dst, char* src ) { char * posptr = hex_dst; - int i; + unsigned i; for( i = 0; i < strlen(src); i++) { posptr += sprintf( posptr, "%02x", (unsigned char)src[i] ); -- 1.7.2.3