From: Bastian Dehn <hhaalo@arcor.de>
Date: Thu, 18 Jul 2024 05:37:01 +0000 (+0200)
Subject: refactor all varaibles declare first
X-Git-Tag: 1.1.0^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=bb72f5223433ae59e7ba4bf5b6caf65fcc17d260;p=mv_none_space.git

refactor all varaibles declare first
---

diff --git a/src/main.c b/src/main.c
index ecd66ae..95ea838 100644
--- 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 c7d247f..06b0349 100644
--- 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);