[PATCH 2/3] Make prefix_path() return char* without const
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Nov 11, 2010, 14:08 UTC
- Message-ID
- <1289484484-8632-3-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1289484484-8632-1-git-send-email-pclouds@gmail.com>
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 <pclouds@gmail.com> --- cache.h | 2 +- setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h index 222d9cf..bd181c6 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 833db12..f930dc0 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);
-- 1.7.3.2.210.g045198