X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=fast-import.c;h=6cd19e580ba710d03682fcaff997fa7e0e555691;hb=4838237cb73a13d38a7e4348b71be96b60eed21e;hp=4b9c4b73a020e9eefa4caf0bd6ec833df424c9a0;hpb=8d68493f20db71abeb77adc251b2a116fe45cdaa;p=git.git diff --git a/fast-import.c b/fast-import.c index 4b9c4b73a..6cd19e580 100644 --- a/fast-import.c +++ b/fast-import.c @@ -855,15 +855,15 @@ static struct tree_content *dup_tree_content(struct tree_content *s) static void start_packfile(void) { - static char tmpfile[PATH_MAX]; + static char tmp_file[PATH_MAX]; struct packed_git *p; struct pack_header hdr; int pack_fd; - pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile), + pack_fd = odb_mkstemp(tmp_file, sizeof(tmp_file), "pack/tmp_pack_XXXXXX"); - p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2); - strcpy(p->pack_name, tmpfile); + p = xcalloc(1, sizeof(*p) + strlen(tmp_file) + 2); + strcpy(p->pack_name, tmp_file); p->pack_fd = pack_fd; p->do_not_close = 1; pack_file = sha1fd(pack_fd, p->pack_name);