Am 22.08.2013 18:58, schrieb Richard Henderson:
> Since FMT_timeval unconditionally uses %ld, cast tv_sec to long.
>
> Signed-off-by: Richard Henderson <r...@twiddle.net>
> ---
> qtest.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/qtest.c b/qtest.c
> index 74f1842..4f6963b 100644
> --- a/qtest.c
> +++ b/qtest.c
> @@ -177,7 +177,7 @@ static void qtest_send_prefix(CharDriverState *chr)
>
> qtest_get_time(&tv);
> fprintf(qtest_log_fp, "[S +" FMT_timeval "] ",
> - tv.tv_sec, (long) tv.tv_usec);
> + (long) tv.tv_sec, (long) tv.tv_usec);
> }
>
> static void GCC_FMT_ATTR(2, 3) qtest_send(CharDriverState *chr,
FMT_timeval is a file-local #define, so why not change that instead of
all its users?
I remember having a local patch around for one of the BSDs for MAX_TIME
or something. We should really make less assumptions about sizes.
Andreas
> @@ -225,7 +225,7 @@ static void qtest_process_command(CharDriverState *chr,
> gchar **words)
>
> qtest_get_time(&tv);
> fprintf(qtest_log_fp, "[R +" FMT_timeval "]",
> - tv.tv_sec, (long) tv.tv_usec);
> + (long) tv.tv_sec, (long) tv.tv_usec);
> for (i = 0; words[i]; i++) {
> fprintf(qtest_log_fp, " %s", words[i]);
> }
> @@ -485,7 +485,7 @@ static void qtest_event(void *opaque, int event)
> qtest_opened = true;
> if (qtest_log_fp) {
> fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n",
> - start_time.tv_sec, (long) start_time.tv_usec);
> + (long) start_time.tv_sec, (long) start_time.tv_usec);
> }
> break;
> case CHR_EVENT_CLOSED:
> @@ -494,7 +494,7 @@ static void qtest_event(void *opaque, int event)
> qemu_timeval tv;
> qtest_get_time(&tv);
> fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n",
> - tv.tv_sec, (long) tv.tv_usec);
> + (long) tv.tv_sec, (long) tv.tv_usec);
> }
> break;
> default:
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
