Merge "Remove a redundant check in statsd socket code." am: e6a644bc35 am: af9b744292

am: de09bc8c94

Change-Id: Id8b0d08d75bb055b00d3880f801b485e0933e27c
This commit is contained in:
Yao Chen 2018-05-24 13:12:51 -07:00 committed by android-build-merger
commit 98c07ba594

View file

@ -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;
}
}