X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7246dc4381c6c95454672a5c1aff65a02d6d3747..951ea4e304cf23f8464a4b6896cfcf4035920249:/components/num_files.c

diff --git a/components/num_files.c b/components/num_files.c
index a8a3894..9179037 100644
--- a/components/num_files.c
+++ b/components/num_files.c
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <dirent.h>
-#include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -11,16 +11,18 @@ num_files(const char *dir)
 {
 	struct dirent *dp;
 	DIR *fd;
-	int num = 0;
+	int num;
 
-	if ((fd = opendir(dir)) == NULL) {
-		warn("Failed to get number of files in directory %s", dir);
+	if (!(fd = opendir(dir))) {
+		warn("opendir '%s':", dir);
 		return NULL;
 	}
 
-	while ((dp = readdir(fd)) != NULL) {
-		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+	num = 0;
+	while ((dp = readdir(fd))) {
+		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
 			continue; /* skip self and parent */
+		}
 		num++;
 	}