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

am: af9b744292

Change-Id: I3ff19e475d7fb013067025a567e4517b64558d33
This commit is contained in:
Yao Chen 2018-05-24 07:28:53 -07:00 committed by android-build-merger
commit de09bc8c94

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