diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-03-20 10:43:19 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-03-24 08:16:27 -0500 |
| commit | 735efe7e6d85bb6d985334b6b994de21c1e9161d (patch) | |
| tree | e74871f0a7ba4886b151b7d8691f4bbcca1edd75 | |
| parent | imfs.h: Add cast to remove warning for pointer/integer size mismatch (diff) | |
| download | rtems-735efe7e6d85bb6d985334b6b994de21c1e9161d.tar.bz2 | |
capture/capture_support.c: Fix printf() warning and formatting
| -rw-r--r-- | cpukit/libmisc/capture/capture_support.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/cpukit/libmisc/capture/capture_support.c b/cpukit/libmisc/capture/capture_support.c index ae77ba87f0..f531666463 100644 --- a/cpukit/libmisc/capture/capture_support.c +++ b/cpukit/libmisc/capture/capture_support.c @@ -68,7 +68,7 @@ rtems_capture_print_timestamp (uint64_t uptime) nanosecs = uptime % 1000000000; fprintf (stdout, "%5" PRIu32 ":%02" PRIu32 ":%02" PRIu32".%09" PRIu32, - hours, minutes, seconds, nanosecs); + hours, minutes, seconds, nanosecs); } void @@ -182,15 +182,19 @@ rtems_capture_print_trace_records ( int total, bool csv ) break; /* Print the record */ - if (csv) - fprintf (stdout, "%03" PRIu32 ",%08" PRIu32 ",%03" PRIu32 - ",%03" PRIu32 ",%04" PRIx32 ",%" PRId64 "\n", - cpu, rec_out->task_id, - (rec_out->events >> RTEMS_CAPTURE_REAL_PRIORITY_EVENT) & 0xff, - (rec_out->events >> RTEMS_CAPTURE_CURR_PRIORITY_EVENT) & 0xff, - (rec_out->events >> RTEMS_CAPTURE_EVENT_START), - (uint64_t) rec_out->time); - else { + if (csv) { + fprintf( + stdout, + "%03" PRIu32 ",%08" PRIu32 ",%03" PRIu32 + ",%03" PRIu32 ",%04" PRIx32 ",%" PRId64 "\n", + cpu, + (uint32_t) rec_out->task_id, + (rec_out->events >> RTEMS_CAPTURE_REAL_PRIORITY_EVENT) & 0xff, + (rec_out->events >> RTEMS_CAPTURE_CURR_PRIORITY_EVENT) & 0xff, + (rec_out->events >> RTEMS_CAPTURE_EVENT_START), + (uint64_t) rec_out->time + ); + } else { if ((rec_out->events >> RTEMS_CAPTURE_EVENT_START) == 0) rtems_capture_print_record_task(cpu, rec_out ); else { |