undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary pack_fd global in fast-import.

Browse Source 
Much like the pack_sha1 the pack_fd is an unnecessary global
variable, we already have the fd stored in our struct packed_git
*pack_data so that the core library functions in sha1_file.c are
able to lookup and decompress object data that we have previously
written.  Keeping an extra copy of this value in our own variable
is just a hold-over from earlier versions of fast-import and is
now completely unnecessary.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-01-16 01:20:57 -05:00
parent 1280158738
commit 0fcbcae753
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fast-import.c
View File

@ -244,7 +244,6 @@ static struct atom_str **atom_table;
static unsigned int pack_id; static unsigned int pack_id;
static struct packed_git *pack_data; static struct packed_git *pack_data;
static struct packed_git **all_packs; static struct packed_git **all_packs;
static int pack_fd;
static unsigned long pack_size; static unsigned long pack_size;
/* Table of objects we've written. */ /* Table of objects we've written. */
@ -592,6 +591,7 @@ static void start_packfile()
static char tmpfile[PATH_MAX]; static char tmpfile[PATH_MAX];
struct packed_git *p; struct packed_git *p;
struct pack_header hdr; struct pack_header hdr;
int pack_fd;
snprintf(tmpfile, sizeof(tmpfile), snprintf(tmpfile, sizeof(tmpfile),
"%s/pack_XXXXXX", get_object_directory()); "%s/pack_XXXXXX", get_object_directory());
@ -605,7 +605,7 @@ static void start_packfile()
hdr.hdr_signature = htonl(PACK_SIGNATURE); hdr.hdr_signature = htonl(PACK_SIGNATURE);
hdr.hdr_version = htonl(2); hdr.hdr_version = htonl(2);
hdr.hdr_entries = 0; hdr.hdr_entries = 0;
write_or_die(pack_fd, &hdr, sizeof(hdr)); write_or_die(p->pack_fd, &hdr, sizeof(hdr));
pack_data = p; pack_data = p;
pack_size = sizeof(hdr); pack_size = sizeof(hdr);
@ -617,6 +617,7 @@ static void start_packfile()
static void fixup_header_footer() static void fixup_header_footer()
{ {
int pack_fd = pack_data->pack_fd;
SHA_CTX c; SHA_CTX c;
char hdr[8]; char hdr[8];
unsigned long cnt; unsigned long cnt;
@ -912,23 +913,23 @@ static int store_object(
last->depth++; last->depth++;
hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr); hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
write_or_die(pack_fd, hdr, hdrlen); write_or_die(pack_data->pack_fd, hdr, hdrlen);
pack_size += hdrlen; pack_size += hdrlen;
hdr[pos] = ofs & 127; hdr[pos] = ofs & 127;
while (ofs >>= 7) while (ofs >>= 7)
hdr[--pos] = 128 | (--ofs & 127); hdr[--pos] = 128 | (--ofs & 127);
write_or_die(pack_fd, hdr + pos, sizeof(hdr) - pos); write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
pack_size += sizeof(hdr) - pos; pack_size += sizeof(hdr) - pos;
} else { } else {
if (last) if (last)
last->depth = 0; last->depth = 0;
hdrlen = encode_header(type, datlen, hdr); hdrlen = encode_header(type, datlen, hdr);
write_or_die(pack_fd, hdr, hdrlen); write_or_die(pack_data->pack_fd, hdr, hdrlen);
pack_size += hdrlen; pack_size += hdrlen;
} }
write_or_die(pack_fd, out, s.total_out); write_or_die(pack_data->pack_fd, out, s.total_out);
pack_size += s.total_out; pack_size += s.total_out;
free(out); free(out);