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

Replace redundant yread() with read_in_full() in fast-import. 

Prior to git having read_in_full() fast-import used its own private
function yread to perform the header reading task.  No sense in
keeping that around now that read_in_full is a public, stable
function.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Shawn O. Pearce 2007-01-16 00:35:41 -05:00
parent 0ea9f045f4
commit 6cf0926193
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fast-import.c
View File

@ -590,19 +590,6 @@ static void release_tree_entry(struct tree_entry *e)
avail_tree_entry = e; avail_tree_entry = e;
} }


static void yread(int fd, void *buffer, size_t length)
{
ssize_t ret = 0;
while (ret < length) {
ssize_t size = xread(fd, (char *) buffer + ret, length - ret);
if (!size)
die("Read from descriptor %i: end of stream", fd);
if (size < 0)
die("Read from descriptor %i: %s", fd, strerror(errno));
ret += size;
}
}

static void start_packfile() static void start_packfile()
{ {
struct packed_git *p; struct packed_git *p;
@ -642,7 +629,8 @@ static void fixup_header_footer()
die("Failed seeking to start: %s", strerror(errno)); die("Failed seeking to start: %s", strerror(errno));


SHA1_Init(&c); SHA1_Init(&c);
yread(pack_fd, hdr, 8); if (read_in_full(pack_fd, hdr, 8) != 8)
die("Unable to reread header of %s", pack_data->pack_name);
SHA1_Update(&c, hdr, 8); SHA1_Update(&c, hdr, 8);


cnt = htonl(object_count); cnt = htonl(object_count);