Skip to content

Commit

Permalink
archive-tar: factor out write_block()
Browse files Browse the repository at this point in the history
All tar archive writes have the same size and are done to the same file
descriptor.  Move them to a common function, write_block(), to reduce
code duplication and make it easy to change the destination.

Original-patch-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
rscharfe authored and gitster committed Jun 15, 2022
1 parent 96b9e51 commit dfce118
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions archive-tar.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,16 @@ static int write_tar_filter_archive(const struct archiver *ar,
#define USTAR_MAX_MTIME 077777777777ULL
#endif

static void write_block(const void *buf)
{
write_or_die(1, buf, BLOCKSIZE);
}

/* writes out the whole block, but only if it is full */
static void write_if_needed(void)
{
if (offset == BLOCKSIZE) {
write_or_die(1, block, BLOCKSIZE);
write_block(block);
offset = 0;
}
}
Expand All @@ -66,7 +71,7 @@ static void do_write_blocked(const void *data, unsigned long size)
write_if_needed();
}
while (size >= BLOCKSIZE) {
write_or_die(1, buf, BLOCKSIZE);
write_block(buf);
size -= BLOCKSIZE;
buf += BLOCKSIZE;
}
Expand Down Expand Up @@ -101,10 +106,10 @@ static void write_trailer(void)
{
int tail = BLOCKSIZE - offset;
memset(block + offset, 0, tail);
write_or_die(1, block, BLOCKSIZE);
write_block(block);
if (tail < 2 * RECORDSIZE) {
memset(block, 0, offset);
write_or_die(1, block, BLOCKSIZE);
write_block(block);
}
}

Expand Down

0 comments on commit dfce118

Please sign in to comment.