C99 printf() -Werror fixes

[fw/openocd] / src / target / trace.c

diff --git a/src/target/trace.c b/src/target/trace.c
index 2e7d45804b60e601c53ecafa1c6a960095dadb1c..17f899fba20f39a94b47545b6a9f9e1eb57ac6cb 100644 (file)
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -25,13 +25,11 @@
 #include "trace.h"
 #include "target.h"
 
-#include <inttypes.h>
-
-int trace_point(target_t *target, u32 number)
+int trace_point(target_t *target, uint32_t number)
 {
        trace_t *trace = target->trace_info;
 
-       LOG_DEBUG("tracepoint: %i", number);
+       LOG_DEBUG("tracepoint: %i", (int)number);
        
        if (number < trace->num_trace_points)
                trace->trace_points[number].hit_counter++;
@@ -56,13 +54,13 @@ static int handle_trace_point_command(struct command_context_s *cmd_ctx, char *c
        
        if (argc == 0)
        {
-               u32 i;
+               uint32_t i;
                
                for (i = 0; i < trace->num_trace_points; i++)
                {
-                       command_print(cmd_ctx, "trace point 0x%8.8x (%"PRIi64" times hit)",
+                       command_print(cmd_ctx, "trace point 0x%8.8" PRIx32 " (%lld times hit)",
                                        trace->trace_points[i].address,
-                                       trace->trace_points[i].hit_counter);
+                                       (long long)trace->trace_points[i].hit_counter);
                }
 
                return ERROR_OK;
@@ -115,15 +113,15 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
                        free(trace->trace_history);
                
                trace->trace_history_size = strtoul(args[0], NULL, 0);
-               trace->trace_history = malloc(sizeof(u32) * trace->trace_history_size);
+               trace->trace_history = malloc(sizeof(uint32_t) * trace->trace_history_size);
                
-               command_print(cmd_ctx, "new trace history size: %i", trace->trace_history_size);
+               command_print(cmd_ctx, "new trace history size: %i", (int)(trace->trace_history_size));
        }
        else
        {
-               u32 i;
-               u32 first = 0;
-               u32 last = trace->trace_history_pos;
+               uint32_t i;
+               uint32_t first = 0;
+               uint32_t last = trace->trace_history_pos;
 
                if ( !trace->trace_history_size ) {
                        command_print(cmd_ctx, "trace history buffer is not allocated");
@@ -139,16 +137,16 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
                {
                        if (trace->trace_history[i % trace->trace_history_size] < trace->num_trace_points)
                        {
-                               u32 address;
+                               uint32_t address;
                                address = trace->trace_points[trace->trace_history[i % trace->trace_history_size]].address;
-                               command_print(cmd_ctx, "trace point %i: 0x%8.8x",
-                                       trace->trace_history[i % trace->trace_history_size],
-                                       address);
+                               command_print(cmd_ctx, "trace point %i: 0x%8.8" PRIx32 "",
+                                             (int)(trace->trace_history[i % trace->trace_history_size]),
+                                             address);
                        }
 
                        else
                        {
-                               command_print(cmd_ctx, "trace point %i: -not defined-", trace->trace_history[i % trace->trace_history_size]);
+                               command_print(cmd_ctx, "trace point %i: -not defined-", (int)(trace->trace_history[i % trace->trace_history_size]));
                        }
                }
        }