drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Alarm: add missing closedir after opendir when searching for RTC"

Browse Source
This commit is contained in:
Narayan Kamath
2016-02-02 09:31:04 +00:00
committed by Gerrit Code Review
parent c71c44a524 e45abfa083
commit 21b2b7306e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/jni/com_android_server_AlarmManagerService.cpp
View File

@ -40,6 +40,8 @@
#include <linux/android_alarm.h> #include <linux/android_alarm.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <memory>
namespace android { namespace android {
static const size_t N_ANDROID_TIMERFDS = ANDROID_ALARM_TYPE_COUNT + 1; static const size_t N_ANDROID_TIMERFDS = ANDROID_ALARM_TYPE_COUNT + 1;
@ -323,14 +325,14 @@ static bool rtc_is_hctosys(unsigned int rtc_id)
static int wall_clock_rtc() static int wall_clock_rtc()
{ {
DIR *dir = opendir(rtc_sysfs); std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir(rtc_sysfs), closedir);
if (!dir) { if (!dir.get()) {
ALOGE("failed to open %s: %s", rtc_sysfs, strerror(errno)); ALOGE("failed to open %s: %s", rtc_sysfs, strerror(errno));
return -1; return -1;
} }
struct dirent *dirent; struct dirent *dirent;
while (errno = 0, dirent = readdir(dir)) { while (errno = 0, dirent = readdir(dir.get())) {
unsigned int rtc_id; unsigned int rtc_id;
int matched = sscanf(dirent->d_name, "rtc%u", &rtc_id); int matched = sscanf(dirent->d_name, "rtc%u", &rtc_id);