From: Jeff King Date: Thu, 20 Apr 2017 21:09:09 +0000 (-0400) Subject: replace xstrdup(git_path(...)) with git_pathdup(...) X-Git-Tag: v2.13.0-rc1~7^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c69644b27eb59fe16c1931580e6fce4abbdc65;p=thirdparty%2Fgit.git replace xstrdup(git_path(...)) with git_pathdup(...) It's more efficient to use git_pathdup(), as it skips an extra copy of the path. And by removing some calls to git_path(), it makes it easier to audit for dangerous uses. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/config.c b/builtin/config.c index 05843a0f96..07fcc2388b 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -599,8 +599,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) if (given_config_source.blob) die("editing blobs is not supported"); git_config(git_default_config, NULL); - config_file = xstrdup(given_config_source.file ? - given_config_source.file : git_path("config")); + config_file = given_config_source.file ? + xstrdup(given_config_source.file) : + git_pathdup("config"); if (use_global_config) { int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666); if (fd >= 0) { diff --git a/fast-import.c b/fast-import.c index 4d5a7f58d0..d2ef8a8729 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3203,7 +3203,7 @@ static char* make_fast_import_path(const char *path) { if (!relative_marks_paths || is_absolute_path(path)) return xstrdup(path); - return xstrdup(git_path("info/fast-import/%s", path)); + return git_pathdup("info/fast-import/%s", path); } static void option_import_marks(const char *marks,