vcs-svn: use error_errno()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d2b6afa2cb
commit
1c8ead97f8
@ -53,9 +53,9 @@ long buffer_tmpfile_prepare_to_read(struct line_buffer *buf)
|
||||
{
|
||||
long pos = ftell(buf->infile);
|
||||
if (pos < 0)
|
||||
return error("ftell error: %s", strerror(errno));
|
||||
return error_errno("ftell error");
|
||||
if (fseek(buf->infile, 0, SEEK_SET))
|
||||
return error("seek error: %s", strerror(errno));
|
||||
return error_errno("seek error");
|
||||
return pos;
|
||||
}
|
||||
|
||||
|
@ -12,7 +12,7 @@ static int input_error(struct line_buffer *file)
|
||||
{
|
||||
if (!buffer_ferror(file))
|
||||
return error("delta preimage ends early");
|
||||
return error("cannot read delta preimage: %s", strerror(errno));
|
||||
return error_errno("cannot read delta preimage");
|
||||
}
|
||||
|
||||
static int skip_or_whine(struct line_buffer *file, off_t gap)
|
||||
|
@ -64,13 +64,13 @@ static int write_strbuf(struct strbuf *sb, FILE *out)
|
||||
{
|
||||
if (fwrite(sb->buf, 1, sb->len, out) == sb->len) /* Success. */
|
||||
return 0;
|
||||
return error("cannot write delta postimage: %s", strerror(errno));
|
||||
return error_errno("cannot write delta postimage");
|
||||
}
|
||||
|
||||
static int error_short_read(struct line_buffer *input)
|
||||
{
|
||||
if (buffer_ferror(input))
|
||||
return error("error reading delta: %s", strerror(errno));
|
||||
return error_errno("error reading delta");
|
||||
return error("invalid delta: unexpected end of file");
|
||||
}
|
||||
|
||||
|
@ -501,7 +501,7 @@ static void init(int report_fd)
|
||||
int svndump_init(const char *filename)
|
||||
{
|
||||
if (buffer_init(&input, filename))
|
||||
return error("cannot open %s: %s", filename ? filename : "NULL", strerror(errno));
|
||||
return error_errno("cannot open %s", filename ? filename : "NULL");
|
||||
init(REPORT_FILENO);
|
||||
return 0;
|
||||
}
|
||||
@ -509,7 +509,7 @@ int svndump_init(const char *filename)
|
||||
int svndump_init_fd(int in_fd, int back_fd)
|
||||
{
|
||||
if(buffer_fdinit(&input, xdup(in_fd)))
|
||||
return error("cannot open fd %d: %s", in_fd, strerror(errno));
|
||||
return error_errno("cannot open fd %d", in_fd);
|
||||
init(xdup(back_fd));
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user