aboutsummaryrefslogtreecommitdiff
path: root/lib/libarchive/archive_read_support_format_empty.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@FreeBSD.org>2007-03-03 07:37:37 +0000
committerTim Kientzle <kientzle@FreeBSD.org>2007-03-03 07:37:37 +0000
commitf81da3e58463558f4efc2a76aac410e9fc03c096 (patch)
tree1b026213a337089af577dee3ed6d194ee1b87d88 /lib/libarchive/archive_read_support_format_empty.c
parent4fce38ec78121b2c00e603f58a0159da7bd974e1 (diff)
Notes
Diffstat (limited to 'lib/libarchive/archive_read_support_format_empty.c')
-rw-r--r--lib/libarchive/archive_read_support_format_empty.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/libarchive/archive_read_support_format_empty.c b/lib/libarchive/archive_read_support_format_empty.c
index 2df219467f392..f729ae6eb4ad2 100644
--- a/lib/libarchive/archive_read_support_format_empty.c
+++ b/lib/libarchive/archive_read_support_format_empty.c
@@ -29,15 +29,17 @@ __FBSDID("$FreeBSD$");
#include "archive.h"
#include "archive_entry.h"
#include "archive_private.h"
+#include "archive_read_private.h"
-static int archive_read_format_empty_bid(struct archive *);
-static int archive_read_format_empty_read_data(struct archive *,
+static int archive_read_format_empty_bid(struct archive_read *);
+static int archive_read_format_empty_read_data(struct archive_read *,
const void **, size_t *, off_t *);
-static int archive_read_format_empty_read_header(struct archive *,
+static int archive_read_format_empty_read_header(struct archive_read *,
struct archive_entry *);
int
-archive_read_support_format_empty(struct archive *a)
+archive_read_support_format_empty(struct archive *_a)
{
+ struct archive_read *a = (struct archive_read *)_a;
int r;
r = __archive_read_register_format(a,
@@ -53,7 +55,7 @@ archive_read_support_format_empty(struct archive *a)
static int
-archive_read_format_empty_bid(struct archive *a)
+archive_read_format_empty_bid(struct archive_read *a)
{
int bytes_read;
const void *h;
@@ -65,20 +67,20 @@ archive_read_format_empty_bid(struct archive *a)
}
static int
-archive_read_format_empty_read_header(struct archive *a,
+archive_read_format_empty_read_header(struct archive_read *a,
struct archive_entry *entry)
{
(void)a; /* UNUSED */
(void)entry; /* UNUSED */
- a->archive_format = ARCHIVE_FORMAT_EMPTY;
- a->archive_format_name = "Empty file";
+ a->archive.archive_format = ARCHIVE_FORMAT_EMPTY;
+ a->archive.archive_format_name = "Empty file";
return (ARCHIVE_EOF);
}
static int
-archive_read_format_empty_read_data(struct archive *a,
+archive_read_format_empty_read_data(struct archive_read *a,
const void **buff, size_t *size, off_t *offset)
{
(void)a; /* UNUSED */