diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 20631b5..eeaf805 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-10-01 Dmitry Kozlov + + * tracepoint.c (trace_status_command): Fix type of printf arg. + (trace_status_mi): Likewise. + 2012-10-01 Andrew Burgess * target.c (simple_search_memory): Include access length in diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index cce8d00..0f94150 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2041,20 +2041,20 @@ trace_status_command (char *args, int from_tty) /* Reporting a run time is more readable than two long numbers. */ printf_filtered (_("Trace started at %ld.%06ld secs, stopped %ld.%06ld secs later.\n"), - (long int) ts->start_time / 1000000, - (long int) ts->start_time % 1000000, - (long int) run_time / 1000000, - (long int) run_time % 1000000); + (long int) (ts->start_time / 1000000), + (long int) (ts->start_time % 1000000), + (long int) (run_time / 1000000), + (long int) (run_time % 1000000)); } else printf_filtered (_("Trace started at %ld.%06ld secs.\n"), - (long int) ts->start_time / 1000000, - (long int) ts->start_time % 1000000); + (long int) (ts->start_time / 1000000), + (long int) (ts->start_time % 1000000)); } else if (ts->stop_time) printf_filtered (_("Trace stopped at %ld.%06ld secs.\n"), - (long int) ts->stop_time / 1000000, - (long int) ts->stop_time % 1000000); + (long int) (ts->stop_time / 1000000), + (long int) (ts->stop_time % 1000000)); /* Now report any per-tracepoint status available. */ tp_vec = all_tracepoints (); @@ -2169,12 +2169,12 @@ trace_status_mi (int on_stop) char buf[100]; xsnprintf (buf, sizeof buf, "%ld.%06ld", - (long int) ts->start_time / 1000000, - (long int) ts->start_time % 1000000); + (long int) (ts->start_time / 1000000), + (long int) (ts->start_time % 1000000)); ui_out_field_string (uiout, "start-time", buf); xsnprintf (buf, sizeof buf, "%ld.%06ld", - (long int) ts->stop_time / 1000000, - (long int) ts->stop_time % 1000000); + (long int) (ts->stop_time / 1000000), + (long int) (ts->stop_time % 1000000)); ui_out_field_string (uiout, "stop-time", buf); } } @@ -3940,12 +3940,12 @@ Status line: '%s'\n"), p, line); } else if (strncmp (p, "starttime", p1 - p) == 0) { - p = unpack_varlen_hex (++p1, &val); + val = strtoulst(++p1, (const char **) &p, 10); ts->start_time = val; } else if (strncmp (p, "stoptime", p1 - p) == 0) { - p = unpack_varlen_hex (++p1, &val); + val = strtoulst(++p1, (const char **) &p, 10); ts->stop_time = val; } else if (strncmp (p, "username", p1 - p) == 0)