Clean-up: declare variables at beginning of scope

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 2417a7d255ffb1445e12ec9e24ba2b5a29900e1d..ee53477de559fedaf43eabfa194ee3255e58b293 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -107,7 +107,7 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
                }
 
                /* Try to resolve this part */
-               try_path = realpath((char *)cut_path, try_path_buf);
+               try_path = realpath((char *) cut_path, try_path_buf);
                if (try_path == NULL) {
                        free(try_path_buf);
                        /*
@@ -1231,14 +1231,15 @@ int utils_recursive_rmdir(const char *path)
 
        path_len = strlen(path);
        while ((entry = readdir(dir))) {
-               if (!strcmp(entry->d_name, ".")
-                               || !strcmp(entry->d_name, ".."))
-                       continue;
-
                struct stat st;
                size_t name_len;
                char filename[PATH_MAX];
 
+               if (!strcmp(entry->d_name, ".")
+                               || !strcmp(entry->d_name, "..")) {
+                       continue;
+               }
+
                name_len = strlen(entry->d_name);
                if (path_len + name_len + 2 > sizeof(filename)) {
                        ERR("Failed to remove file: path name too long (%s/%s)",