d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear the error message buffer on entry to major routines.

Browse Source 
This avoids having error messages get concatenated over multiple calls.
This commit is contained in:
kientzle 2005-02-12 23:11:29 +00:00
parent d7de376121
commit c17dc84307
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libarchive/archive_write.c
View File

@ -126,6 +126,7 @@ archive_write_open(struct archive *a, void *client_data,
ret = ARCHIVE_OK; ret = ARCHIVE_OK;
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW);
archive_string_empty(&a->error_string);
a->state = ARCHIVE_STATE_HEADER; a->state = ARCHIVE_STATE_HEADER;
a->client_data = client_data; a->client_data = client_data;
a->client_writer = writer; a->client_writer = writer;
@ -194,6 +195,7 @@ archive_write_header(struct archive *a, struct archive_entry *entry)
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, archive_check_magic(a, ARCHIVE_WRITE_MAGIC,
ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA); ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA);
archive_string_empty(&a->error_string);
/* Finish last entry. */ /* Finish last entry. */
if (a->state & ARCHIVE_STATE_DATA) if (a->state & ARCHIVE_STATE_DATA)
@ -221,6 +223,7 @@ archive_write_data(struct archive *a, const void *buff, size_t s)
{ {
int ret; int ret;
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA); archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA);
archive_string_empty(&a->error_string);
ret = (a->format_write_data)(a, buff, s); ret = (a->format_write_data)(a, buff, s);
return (ret == ARCHIVE_OK ? (ssize_t)s : -1); return (ret == ARCHIVE_OK ? (ssize_t)s : -1);
} }