refactor all varaibles declare first

diff --git a/src/main.c b/src/main.c
index ecd66ae8b25fcb89576d703d7bf9f6ecfc161700..95ea838b15881cbf9695929ef0dd4b62fe2821c8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -8,17 +8,20 @@
 
 void rename_files(const char* dir_path, rename_func_ptr renamefunc)
 {
-       char* input_filename = malloc(sizeof(char) * STR_MAX_LENGTH);
-       memset(input_filename, 0, STR_MAX_LENGTH);
-       char* output_filename = malloc(sizeof(char) * STR_MAX_LENGTH);
-       memset(output_filename, 0, STR_MAX_LENGTH);
        glob_t files;
        struct stat statbuf;
+       char* pattern = NULL;
+       char* input_filename = NULL;
+       char* output_filename = NULL;
 
-       int len = strlen(dir_path);
-       char* pattern = malloc(sizeof(char) * len + 3);
-       sprintf(pattern, "%s/*", dir_path);
+       pattern = malloc(sizeof(char) * strlen(dir_path) + 3);
+       input_filename = malloc(sizeof(char) * STR_MAX_LENGTH);
+       output_filename = malloc(sizeof(char) * STR_MAX_LENGTH);
+
+       memset(input_filename, 0, STR_MAX_LENGTH);
+       memset(output_filename, 0, STR_MAX_LENGTH);
 
+       sprintf(pattern, "%s/*", dir_path);
        glob(pattern, 0, NULL, &files);
 
        for (int i = 0; i < files.gl_pathc; i++) {
@@ -39,12 +42,12 @@ void rename_files(const char* dir_path, rename_func_ptr renamefunc)
        }
 
        globfree(&files);
-       free(output_filename);
-       output_filename = NULL;
-       free(input_filename);
-       input_filename = NULL;
        free(pattern);
        pattern = NULL;
+       free(input_filename);
+       input_filename = NULL;
+       free(output_filename);
+       output_filename = NULL;
 }
 
 int main(int argc, char* argv[])

diff --git a/src/rename.c b/src/rename.c
index c7d247fe756a8ba5b33930e753cef63cd0184afd..06b03491c10fffc708ce71fbd9e54619eb68fab8 100644 (file)
--- a/src/rename.c
+++ b/src/rename.c
@@ -28,6 +28,7 @@ void escape_str(char* src, char* dst)
 
 void rename_point_str(char* src, char* dst)
 {
+       char* tmp_str = NULL;
        int len = strlen(src);
        int point_count = 0;
        for (int i = len - 1; i >= 0; i--) {
@@ -38,7 +39,7 @@ void rename_point_str(char* src, char* dst)
                        break;
        }
 
-       char* tmp_str = malloc(sizeof(char) * len + 1);
+       tmp_str = malloc(sizeof(char) * len + 1);
        memset(tmp_str, 0, len + 1);
        strncpy(tmp_str, src, len - point_count);