From 6b64bc4d9af7f1ef1130c5dec279a479322ea5fe Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Mon, 11 Sep 2017 13:31:41 +0900 Subject: [PATCH] remove build warning Touchscreen_init calls the open function of hal at the beginning of the boot with the call stack below. So the open function of hal is never called at the same time in multi-thread. Therefore, we can use safely readdir in deviced. 0 touchscreen_init 1 0x2a00b02c in devices_init (data=0x0) at /usr/src/debug/deviced-2.0.0/src/core/devices.c:102 2 0x2a00e424 in deviced_main (argc=, argv=) at /usr/src/debug/deviced-2.0.0/src/core/main.c:93 3 0x2a0078f4 in main (argc=1, argv=0xbefffe64) at /usr/src/debug/deviced-2.0.0/src/core/main.c:123 Signed-off-by: INSUN PYO Change-Id: I188a49d5b8a01b145ad421d20ee936503f0084e0 (cherry picked from commit 8a6aa43bf479e645fbccbe4611611ad083c4acca) --- hw/touchscreen/touchscreen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/touchscreen/touchscreen.c b/hw/touchscreen/touchscreen.c index 1d5be64..fe3c97e 100644 --- a/hw/touchscreen/touchscreen.c +++ b/hw/touchscreen/touchscreen.c @@ -40,7 +40,6 @@ static char *touchscreen_node; static int touchscreen_probe(void) { DIR *d; - struct dirent entry; struct dirent *dir; char buf[PATH_MAX]; int val, ret = -ENOTSUP; @@ -49,7 +48,7 @@ static int touchscreen_probe(void) if (!d) return -errno; - while (readdir_r(d, &entry, &dir) == 0 && dir != NULL) { + while ((dir = readdir(d))) { if (dir->d_name[0] == '.') continue; snprintf(buf, sizeof(buf), "%s%s%s", INPUT_PATH, -- 2.7.4