Skip to content

Commit

Permalink
Make read_in_full() and write_in_full() consistent with xread() and x…
Browse files Browse the repository at this point in the history
…write()

xread() and xwrite() return ssize_t values as their native POSIX
counterparts read(2) and write(2).

To be consistent, read_in_full() and write_in_full() should also return
ssize_t values.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Heikki Orsila authored and Junio C Hamano committed Apr 30, 2008
1 parent 9f1915d commit 0104ca0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -726,8 +726,8 @@ extern const char *git_log_output_encoding;
extern void maybe_flush_or_die(FILE *, const char *);
extern int copy_fd(int ifd, int ofd);
extern int copy_file(const char *dst, const char *src, int mode);
extern int read_in_full(int fd, void *buf, size_t count);
extern int write_in_full(int fd, const void *buf, size_t count);
extern ssize_t read_in_full(int fd, void *buf, size_t count);
extern ssize_t write_in_full(int fd, const void *buf, size_t count);
extern void write_or_die(int fd, const void *buf, size_t count);
extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
Expand Down
3 changes: 2 additions & 1 deletion path.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ int validate_headref(const char *path)
struct stat st;
char *buf, buffer[256];
unsigned char sha1[20];
int len, fd;
int fd;
ssize_t len;

if (lstat(path, &st) < 0)
return -1;
Expand Down
3 changes: 2 additions & 1 deletion refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,8 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re

const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *flag)
{
int depth = MAXDEPTH, len;
int depth = MAXDEPTH;
ssize_t len;
char buffer[256];
static char ref_buffer[256];

Expand Down
4 changes: 2 additions & 2 deletions write_or_die.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void maybe_flush_or_die(FILE *f, const char *desc)
}
}

int read_in_full(int fd, void *buf, size_t count)
ssize_t read_in_full(int fd, void *buf, size_t count)
{
char *p = buf;
ssize_t total = 0;
Expand All @@ -57,7 +57,7 @@ int read_in_full(int fd, void *buf, size_t count)
return total;
}

int write_in_full(int fd, const void *buf, size_t count)
ssize_t write_in_full(int fd, const void *buf, size_t count)
{
const char *p = buf;
ssize_t total = 0;
Expand Down

0 comments on commit 0104ca0

Please sign in to comment.