kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sha1_file_name(): declare to return a const string 

Change the return value of sha1_file_name() to (const char *).
(Callers have no business mucking about here.)  Change callers
accordingly, deleting a few superfluous temporary variables along the
way.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-02-21 17:32:05 +01:00 committed by Junio C Hamano
parent 1b1005d1b5
commit 30d6c6eabf
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -659,7 +659,7 @@ extern char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)
extern char *git_path_submodule(const char *path, const char *fmt, ...) extern char *git_path_submodule(const char *path, const char *fmt, ...)
__attribute__((format (printf, 2, 3))); __attribute__((format (printf, 2, 3)));


extern char *sha1_file_name(const unsigned char *sha1); extern const char *sha1_file_name(const unsigned char *sha1);
extern char *sha1_pack_name(const unsigned char *sha1); extern char *sha1_pack_name(const unsigned char *sha1);
extern char *sha1_pack_index_name(const unsigned char *sha1); extern char *sha1_pack_index_name(const unsigned char *sha1);
extern const char *find_unique_abbrev(const unsigned char *sha1, int); extern const char *find_unique_abbrev(const unsigned char *sha1, int);

2
http.c
View File

@ -1384,7 +1384,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
unsigned char *sha1) unsigned char *sha1)
{ {
char *hex = sha1_to_hex(sha1); char *hex = sha1_to_hex(sha1);
char *filename; const char *filename;
char prevfile[PATH_MAX]; char prevfile[PATH_MAX];
int prevlocal; int prevlocal;
char prev_buf[PREV_BUF_SIZE]; char prev_buf[PREV_BUF_SIZE];

24
sha1_file.c
View File

@ -194,7 +194,7 @@ static void fill_sha1_path(char *pathbuf, const unsigned char *sha1)
* DB_ENVIRONMENT environment variable if it is not found in * DB_ENVIRONMENT environment variable if it is not found in
* the primary object database. * the primary object database.
*/ */
char *sha1_file_name(const unsigned char *sha1) const char *sha1_file_name(const unsigned char *sha1)
{ {
static char buf[PATH_MAX]; static char buf[PATH_MAX];
const char *objdir; const char *objdir;
@ -444,8 +444,7 @@ void prepare_alt_odb(void)


static int has_loose_object_local(const unsigned char *sha1) static int has_loose_object_local(const unsigned char *sha1)
{ {
char *name = sha1_file_name(sha1); return !access(sha1_file_name(sha1), F_OK);
return !access(name, F_OK);
} }


int has_loose_object_nonlocal(const unsigned char *sha1) int has_loose_object_nonlocal(const unsigned char *sha1)
@ -1420,17 +1419,15 @@ static int git_open_noatime(const char *name)


static int stat_sha1_file(const unsigned char *sha1, struct stat *st) static int stat_sha1_file(const unsigned char *sha1, struct stat *st)
{ {
char *name = sha1_file_name(sha1);
struct alternate_object_database *alt; struct alternate_object_database *alt;


if (!lstat(name, st)) if (!lstat(sha1_file_name(sha1), st))
return 0; return 0;


prepare_alt_odb(); prepare_alt_odb();
errno = ENOENT; errno = ENOENT;
for (alt = alt_odb_list; alt; alt = alt->next) { for (alt = alt_odb_list; alt; alt = alt->next) {
name = alt->name; fill_sha1_path(alt->name, sha1);
fill_sha1_path(name, sha1);
if (!lstat(alt->base, st)) if (!lstat(alt->base, st))
return 0; return 0;
} }
@ -1441,18 +1438,16 @@ static int stat_sha1_file(const unsigned char *sha1, struct stat *st)
static int open_sha1_file(const unsigned char *sha1) static int open_sha1_file(const unsigned char *sha1)
{ {
int fd; int fd;
char *name = sha1_file_name(sha1);
struct alternate_object_database *alt; struct alternate_object_database *alt;


fd = git_open_noatime(name); fd = git_open_noatime(sha1_file_name(sha1));
if (fd >= 0) if (fd >= 0)
return fd; return fd;


prepare_alt_odb(); prepare_alt_odb();
errno = ENOENT; errno = ENOENT;
for (alt = alt_odb_list; alt; alt = alt->next) { for (alt = alt_odb_list; alt; alt = alt->next) {
name = alt->name; fill_sha1_path(alt->name, sha1);
fill_sha1_path(name, sha1);
fd = git_open_noatime(alt->base); fd = git_open_noatime(alt->base);
if (fd >= 0) if (fd >= 0)
return fd; return fd;
@ -2687,7 +2682,6 @@ void *read_sha1_file_extended(const unsigned char *sha1,
unsigned flag) unsigned flag)
{ {
void *data; void *data;
char *path;
const struct packed_git *p; const struct packed_git *p;
const unsigned char *repl = lookup_replace_object_extended(sha1, flag); const unsigned char *repl = lookup_replace_object_extended(sha1, flag);


@ -2705,7 +2699,8 @@ void *read_sha1_file_extended(const unsigned char *sha1,
sha1_to_hex(repl), sha1_to_hex(sha1)); sha1_to_hex(repl), sha1_to_hex(sha1));


if (has_loose_object(repl)) { if (has_loose_object(repl)) {
path = sha1_file_name(sha1); const char *path = sha1_file_name(sha1);

die("loose object %s (stored in %s) is corrupt", die("loose object %s (stored in %s) is corrupt",
sha1_to_hex(repl), path); sha1_to_hex(repl), path);
} }
@ -2903,10 +2898,9 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
git_zstream stream; git_zstream stream;
git_SHA_CTX c; git_SHA_CTX c;
unsigned char parano_sha1[20]; unsigned char parano_sha1[20];
char *filename;
static char tmp_file[PATH_MAX]; static char tmp_file[PATH_MAX];
const char *filename = sha1_file_name(sha1);


filename = sha1_file_name(sha1);
fd = create_tmpfile(tmp_file, sizeof(tmp_file), filename); fd = create_tmpfile(tmp_file, sizeof(tmp_file), filename);
if (fd < 0) { if (fd < 0) {
if (errno == EACCES) if (errno == EACCES)