aboutsummaryrefslogtreecommitdiff
path: root/lib/libarchive
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@FreeBSD.org>2008-05-10 07:03:18 +0000
committerTim Kientzle <kientzle@FreeBSD.org>2008-05-10 07:03:18 +0000
commitdd068327687890862a6e7d52bf3542b33b56ee9b (patch)
tree59532b4cee2a32fc22cf04a3c66b4300232d9eec /lib/libarchive
parent975f28bca1bb506fd04a4a3e23f9300e4108b6e2 (diff)
Notes
Diffstat (limited to 'lib/libarchive')
-rw-r--r--lib/libarchive/archive_read.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 1028c5dc9b20..259fd7c8f2a8 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -64,25 +64,12 @@ struct archive *
archive_read_new(void)
{
struct archive_read *a;
- unsigned char *nulls;
a = (struct archive_read *)malloc(sizeof(*a));
if (a == NULL)
return (NULL);
memset(a, 0, sizeof(*a));
a->archive.magic = ARCHIVE_READ_MAGIC;
- a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK;
-
- a->null_length = 1024;
- nulls = (unsigned char *)malloc(a->null_length);
- if (nulls == NULL) {
- archive_set_error(&a->archive, ENOMEM,
- "Can't allocate archive object 'nulls' element");
- free(a);
- return (NULL);
- }
- memset(nulls, 0, a->null_length);
- a->nulls = nulls;
a->archive.state = ARCHIVE_STATE_NEW;
a->entry = archive_entry_new();
@@ -660,8 +647,6 @@ archive_read_finish(struct archive *_a)
(a->formats[i].cleanup)(a);
}
- /* Casting a pointer to int allows us to remove 'const.' */
- free((void *)(uintptr_t)(const void *)a->nulls);
archive_string_free(&a->archive.error_string);
if (a->entry)
archive_entry_free(a->entry);