X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-objects.c;h=247edf052900e22c958595f34b7bce886c369377;hb=4fa2197e614950279527b14825d1e9572454a48c;hp=6cb0f29be8a1eed5c22c90894560e399aa537f56;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;p=git.git diff --git a/fsck-objects.c b/fsck-objects.c index 6cb0f29b..247edf05 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -30,7 +30,7 @@ static void objreport(struct object *obj, const char *severity, fputs("\n", stderr); } -int objerror(struct object *obj, const char *err, ...) +static int objerror(struct object *obj, const char *err, ...) { va_list params; va_start(params, err); @@ -39,7 +39,7 @@ int objerror(struct object *obj, const char *err, ...) return -1; } -int objwarning(struct object *obj, const char *err, ...) +static int objwarning(struct object *obj, const char *err, ...) { va_list params; va_start(params, err); @@ -406,10 +406,7 @@ static int fsck_head_link(void) char hex[40]; unsigned char sha1[20]; static char path[PATH_MAX], link[PATH_MAX]; - const char *git_dir; - - git_dir = getenv(GIT_DIR_ENVIRONMENT); - if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; + const char *git_dir = get_git_dir(); snprintf(path, sizeof(path), "%s/HEAD", git_dir); if (readlink(path, link, sizeof(link)) < 0)