From d2d0268b167c6f2cca85aa45f757b436c58a747d Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 11 Sep 2013 16:10:16 +0200 Subject: [PATCH] udevtrigger: simplify scan_block function Remove the local directory scanning code and use the scan_subdir function instead. Signed-off-by: Gabor Juhos --- udevtrigger.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/udevtrigger.c b/udevtrigger.c index 08ddb06..423df6a 100644 --- a/udevtrigger.c +++ b/udevtrigger.c @@ -230,32 +230,10 @@ static void scan_subsystem(const char *subsys) static void scan_block(void) { char base[PATH_SIZE]; - DIR *dir; - struct dirent *dent; strlcpy(base, "/sys/block", sizeof(base)); - dir = opendir(base); - if (dir == NULL) - return; - - for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char dirname[PATH_SIZE]; - - if (dent->d_name[0] == '.') - continue; - - strlcpy(dirname, base, sizeof(dirname)); - strlcat(dirname, "/", sizeof(dirname)); - strlcat(dirname, dent->d_name, sizeof(dirname)); - if (device_list_insert(dirname) != 0) - continue; - - /* look for partitions */ - scan_subdir(dirname, NULL, true, 0); - } - - closedir(dir); + scan_subdir("/sys/block", NULL, true, 1); } static void scan_class(void) -- 2.11.0