Refactor entropy.c

[slstatus.git] / components / num_files.c

diff --git a/components/num_files.c b/components/num_files.c
index a8a3894..9179037 100644 (file)
--- 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>
 /* See LICENSE file for copyright and license details. */
 #include <dirent.h>

-#include <err.h>
+#include <errno.h>

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -11,16 +11,18 @@ num_files(const char *dir)
 {
        struct dirent *dp;
        DIR *fd;
 {
        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;
        }
 
                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 */
                        continue; /* skip self and parent */

+               }

                num++;
        }
 
                num++;
        }