From: Dmitry V. Levin Date: Sat, 6 Jan 2018 01:45:16 +0000 (+0000) Subject: print_timeval.c: use xsprintf instead of snprintf X-Git-Tag: v4.21~204 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a877397a79e54173709ee16b254f288c3ac27c56;p=strace print_timeval.c: use xsprintf instead of snprintf * print_timeval.c: Include "xstring.h". (sprint_timeval, sprint_timeval32): Replace snprintf with xsprintf. --- diff --git a/print_timeval.c b/print_timeval.c index 8e0708f4..7fff19a1 100644 --- a/print_timeval.c +++ b/print_timeval.c @@ -33,6 +33,8 @@ typedef struct timeval timeval_t; #include MPERS_DEFS +#include "xstring.h" + static const char timeval_fmt[] = "{tv_sec=%lld, tv_usec=%llu}"; static void @@ -103,9 +105,9 @@ MPERS_PRINTER_DECL(const char *, sprint_timeval, strcpy(buf, "NULL"); } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) || umove(tcp, addr, &t)) { - snprintf(buf, sizeof(buf), "%#" PRI_klx, addr); + xsprintf(buf, "%#" PRI_klx, addr); } else { - snprintf(buf, sizeof(buf), timeval_fmt, + xsprintf(buf, timeval_fmt, (long long) t.tv_sec, zero_extend_signed_to_ull(t.tv_usec)); } @@ -196,9 +198,9 @@ sprint_timeval32(struct tcb *const tcp, const kernel_ulong_t addr) strcpy(buf, "NULL"); } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) || umove(tcp, addr, &t)) { - snprintf(buf, sizeof(buf), "%#" PRI_klx, addr); + xsprintf(buf, "%#" PRI_klx, addr); } else { - snprintf(buf, sizeof(buf), timeval_fmt, + xsprintf(buf, timeval_fmt, (long long) t.tv_sec, zero_extend_signed_to_ull(t.tv_usec)); }