From 98e044a6090fa239eca6736436d6a7efa8028066 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Fri, 28 Oct 2011 18:05:47 -0700 Subject: BatteryService(jni): properly handle read's return value Change-Id: I10f5cf3728424e7f5a0c1b460049102fd00a6246 Signed-off-by: Dima Zavin --- services/jni/com_android_server_BatteryService.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp index b9f2c1f182d1..2ceb5356e624 100644 --- a/services/jni/com_android_server_BatteryService.cpp +++ b/services/jni/com_android_server_BatteryService.cpp @@ -141,10 +141,10 @@ static int readFromFile(const char* path, char* buf, size_t size) return -1; } - size_t count = read(fd, buf, size); + ssize_t count = read(fd, buf, size); if (count > 0) { - count = (count < size) ? count : size - 1; - while (count > 0 && buf[count-1] == '\n') count--; + while (count > 0 && buf[count-1] == '\n') + count--; buf[count] = '\0'; } else { buf[0] = '\0'; -- cgit v1.2.3-59-g8ed1b