From: Nguyễn Thái Ngọc Duy Date: Thu, 11 Nov 2010 14:08:03 +0000 (+0700) Subject: Make prefix_path() return char* without const X-Git-Tag: v1.7.4-rc0~33^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edc54fb5d4ce6774fc2ac76779bd57dc2d6ab189;p=git.git Make prefix_path() return char* without const prefix_path() allocates new buffer. There's no reason for it to keep the buffer for itself and waste memory. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/cache.h b/cache.h index 222d9cf3a..bd181c6e7 100644 --- a/cache.h +++ b/cache.h @@ -428,7 +428,7 @@ extern const char **get_pathspec(const char *prefix, const char **pathspec); extern void setup_work_tree(void); extern const char *setup_git_directory_gently(int *); extern const char *setup_git_directory(void); -extern const char *prefix_path(const char *prefix, int len, const char *path); +extern char *prefix_path(const char *prefix, int len, const char *path); extern const char *prefix_filename(const char *prefix, int len, const char *path); extern int check_filename(const char *prefix, const char *name); extern void verify_filename(const char *prefix, const char *name); diff --git a/setup.c b/setup.c index 833db12bc..f930dc096 100644 --- a/setup.c +++ b/setup.c @@ -4,7 +4,7 @@ static int inside_git_dir = -1; static int inside_work_tree = -1; -const char *prefix_path(const char *prefix, int len, const char *path) +char *prefix_path(const char *prefix, int len, const char *path) { const char *orig = path; char *sanitized = xmalloc(len + strlen(path) + 1);