From b9c7ae621172bba141ef96e95e43f658c3643c71 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 1 Sep 2011 11:40:40 +0200 Subject: Simplify sprinttv() * time.c (sprinttv): Trivial simplifications. Signed-off-by: Denys Vlasenko --- time.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'time.c') diff --git a/time.c b/time.c index 932c71f..daceeaa 100644 --- a/time.c +++ b/time.c @@ -120,10 +120,8 @@ sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf) if (addr == 0) return stpcpy(buf, "NULL"); - if (!verbose(tcp)) { - buf += sprintf(buf, "%#lx", addr); - return buf; - } + if (!verbose(tcp)) + return buf + sprintf(buf, "%#lx", addr); if (bitness == BITNESS_32 #if defined(LINUX) && SUPPORTED_PERSONALITIES > 1 @@ -135,21 +133,19 @@ sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf) rc = umove(tcp, addr, &tv); if (rc >= 0) - buf += sprintf(buf, "{%u, %u}", + return buf + sprintf(buf, "{%u, %u}", tv.tv_sec, tv.tv_usec); } else { struct timeval tv; rc = umove(tcp, addr, &tv); if (rc >= 0) - buf += sprintf(buf, "{%lu, %lu}", + return buf + sprintf(buf, "{%lu, %lu}", (unsigned long) tv.tv_sec, (unsigned long) tv.tv_usec); } - if (rc < 0) - buf = stpcpy(buf, "{...}"); - return buf; + return stpcpy(buf, "{...}"); } void print_timespec(struct tcb *tcp, long addr) -- cgit v1.2.3