From 4d1deed139bbfabd7c3078a802e5b6a69f3ed8e8 Mon Sep 17 00:00:00 2001 From: Yao Chen Date: Tue, 22 May 2018 15:57:08 -0700 Subject: [PATCH] Remove a redundant check in statsd socket code. The original liblog code has this additional check because there may be multiple writers registered, there is a for-loop and the retVal is set to be the FIRST error. Statsd doesn't need it because it only has one writer. Test: locally tested. Change-Id: I03f0015d0c29eba19eb2b5ea145380cb98fb2509 --- libstats/stats_event_list.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libstats/stats_event_list.c b/libstats/stats_event_list.c index 966bb08a2..3d746db18 100644 --- a/libstats/stats_event_list.c +++ b/libstats/stats_event_list.c @@ -131,7 +131,7 @@ static int __write_to_statsd_initialize_locked() { } static int __write_to_stats_daemon(struct iovec* vec, size_t nr) { - int ret, save_errno; + int save_errno; struct timespec ts; size_t len, i; @@ -145,14 +145,7 @@ static int __write_to_stats_daemon(struct iovec* vec, size_t nr) { save_errno = errno; clock_gettime(CLOCK_REALTIME, &ts); - ret = 0; - - ssize_t retval; - retval = (*statsdLoggerWrite.write)(&ts, vec, nr); - if (ret >= 0) { - ret = retval; - } - + int ret = (int)(*statsdLoggerWrite.write)(&ts, vec, nr); errno = save_errno; return ret; } @@ -178,4 +171,4 @@ static int __write_to_statsd_init(struct iovec* vec, size_t nr) { ret = write_to_statsd(vec, nr); errno = save_errno; return ret; -} \ No newline at end of file +}