From: Dima Kov <dima.kovol@xxxxxxxxx>
Use one "free" call at the end of the function,
instead of being dependent on the execution flow.
Signed-off-by: Dima Kov <dima.kovol@xxxxxxxxx>
---
refactor of git_setup_gettext method
Use one "free" call at the end of the function, instead of being
dependent on the execution flow.
Signed-off-by: Dima Kov dima.kovol@xxxxxxxxx
Hi. My first PR fot Git repository. I went over the code and saw that
maybe this part can be more clearer. Thanks.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-964%2Fdimakov%2Ffree_opt-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-964/dimakov/free_opt-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/964
gettext.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gettext.c b/gettext.c
index af2413b47e85..e75c7bfdb1a8 100644
--- a/gettext.c
+++ b/gettext.c
@@ -109,17 +109,14 @@ void git_setup_gettext(void)
if (!podir)
podir = p = system_path(GIT_LOCALE_PATH);
- if (!is_directory(podir)) {
- free(p);
- return;
+ if (is_directory(podir)) {
+ bindtextdomain("git", podir);
+ setlocale(LC_MESSAGES, "");
+ setlocale(LC_TIME, "");
+ init_gettext_charset("git");
+ textdomain("git");
}
- bindtextdomain("git", podir);
- setlocale(LC_MESSAGES, "");
- setlocale(LC_TIME, "");
- init_gettext_charset("git");
- textdomain("git");
-
free(p);
}
base-commit: de88ac70f3a801262eb3aa087e5d9a712be0a54a
--
gitgitgadget
