diff options
author | Tim Kientzle <kientzle@FreeBSD.org> | 2005-06-01 15:52:39 +0000 |
---|---|---|
committer | Tim Kientzle <kientzle@FreeBSD.org> | 2005-06-01 15:52:39 +0000 |
commit | 0f412b97da91a55dcdde53af281d7563cc5d031b (patch) | |
tree | 8b0726506b461ec34909f06cc5e3be340671c434 /lib | |
parent | f65d1d5147a73ddba73046ee3823263d8650e911 (diff) | |
download | src-0f412b97da91a55dcdde53af281d7563cc5d031b.tar.gz src-0f412b97da91a55dcdde53af281d7563cc5d031b.zip |
Remove the C99-specific __func__ that is one of the few barrier to
compiling on IRIX and Solaris. Remove the "archive_check_magic" macro
that existed only to provide __func__ to the underlying __archive_check_magic
function.
Thanks to: Darin Broady
MFC after: 14 days
Notes
Notes:
svn path=/head/; revision=146877
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libarchive/archive_private.h | 32 | ||||
-rw-r--r-- | lib/libarchive/archive_read.c | 20 | ||||
-rw-r--r-- | lib/libarchive/archive_read_data_into_fd.c | 2 | ||||
-rw-r--r-- | lib/libarchive/archive_write.c | 16 | ||||
-rw-r--r-- | lib/libarchive/archive_write_set_compression_bzip2.c | 2 | ||||
-rw-r--r-- | lib/libarchive/archive_write_set_compression_gzip.c | 2 | ||||
-rw-r--r-- | lib/libarchive/archive_write_set_compression_none.c | 2 |
7 files changed, 39 insertions, 37 deletions
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h index c3f774c93481..0b96180352f8 100644 --- a/lib/libarchive/archive_private.h +++ b/lib/libarchive/archive_private.h @@ -199,16 +199,6 @@ struct archive { }; -/* - * Utility function to format a USTAR header into a buffer. If - * "strict" is set, this tries to create the absolutely most portable - * version of a ustar header. If "strict" is set to 0, then it will - * relax certain requirements. - */ -int -__archive_write_format_header_ustar(struct archive *, char buff[512], - struct archive_entry *, int tartype, int strict); - #define ARCHIVE_STATE_ANY 0xFFFFU #define ARCHIVE_STATE_NEW 1U #define ARCHIVE_STATE_HEADER 2U @@ -218,12 +208,9 @@ __archive_write_format_header_ustar(struct archive *, char buff[512], #define ARCHIVE_STATE_FATAL 0x8000U /* Check magic value and state; exit if it isn't valid. */ -void -__archive_check_magic(struct archive *, unsigned magic, - unsigned state, const char *func); +void __archive_check_magic(struct archive *, unsigned magic, + unsigned state, const char *func); -#define archive_check_magic(a,m,s) \ - __archive_check_magic((a), (m), (s), __func__) int __archive_read_register_format(struct archive *a, void *format_data, @@ -241,4 +228,19 @@ void __archive_errx(int retvalue, const char *msg); #define err_combine(a,b) ((a) < (b) ? (a) : (b)) + +/* + * Utility function to format a USTAR header into a buffer. If + * "strict" is set, this tries to create the absolutely most portable + * version of a ustar header. If "strict" is set to 0, then it will + * relax certain requirements. + * + * Generally, format-specific declarations don't belong in this + * header; this is a rare example of a function that is shared by + * two very similar formats (ustar and pax). + */ +int +__archive_write_format_header_ustar(struct archive *, char buff[512], + struct archive_entry *, int tartype, int strict); + #endif diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c index 1d01b8ec031d..61a9661b350a 100644 --- a/lib/libarchive/archive_read.c +++ b/lib/libarchive/archive_read.c @@ -85,7 +85,7 @@ archive_read_new(void) int archive_read_set_bytes_per_block(struct archive *a, int bytes_per_block) { - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_set_bytes_per_block"); if (bytes_per_block < 1) bytes_per_block = 1; a->bytes_per_block = bytes_per_block; @@ -106,7 +106,7 @@ archive_read_open(struct archive *a, void *client_data, int high_bidder; int e; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_open"); if (reader == NULL) __archive_errx(1, @@ -207,8 +207,8 @@ archive_read_next_header(struct archive *a, struct archive_entry **entryp) struct archive_entry *entry; int slot, ret; - archive_check_magic(a, ARCHIVE_READ_MAGIC, - ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, + ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA, "archive_read_next_header"); *entryp = NULL; entry = a->entry; @@ -405,7 +405,7 @@ archive_read_data_skip(struct archive *a) ssize_t size; off_t offset; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA, "archive_read_data_skip"); if (a->format->read_data_skip != NULL) r = (a->format->read_data_skip)(a); @@ -434,7 +434,7 @@ int archive_read_data_block(struct archive *a, const void **buff, size_t *size, off_t *offset) { - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA, "archive_read_data_block"); if (a->format->read_data == NULL) { archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, @@ -456,7 +456,7 @@ archive_read_data_block(struct archive *a, int archive_read_close(struct archive *a) { - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY, "archive_read_close"); a->state = ARCHIVE_STATE_CLOSED; /* Call cleanup functions registered by optional components. */ @@ -480,7 +480,7 @@ archive_read_finish(struct archive *a) int i; int slots; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY, "archive_read_finish"); if (a->state != ARCHIVE_STATE_CLOSED) archive_read_close(a); @@ -516,7 +516,7 @@ __archive_read_register_format(struct archive *a, { int i, number_slots; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "__archive_read_register_format"); number_slots = sizeof(a->formats) / sizeof(a->formats[0]); @@ -549,7 +549,7 @@ __archive_read_register_compression(struct archive *a, { int i, number_slots; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "__archive_read_register_compression"); number_slots = sizeof(a->decompressors) / sizeof(a->decompressors[0]); diff --git a/lib/libarchive/archive_read_data_into_fd.c b/lib/libarchive/archive_read_data_into_fd.c index b2143cae8107..b01220dd73d7 100644 --- a/lib/libarchive/archive_read_data_into_fd.c +++ b/lib/libarchive/archive_read_data_into_fd.c @@ -49,7 +49,7 @@ archive_read_data_into_fd(struct archive *a, int fd) off_t offset; off_t output_offset; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA, "archive_read_data_into_fd"); total_written = 0; output_offset = 0; diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c index a3377db569fc..3e87eead2ac7 100644 --- a/lib/libarchive/archive_write.c +++ b/lib/libarchive/archive_write.c @@ -95,7 +95,7 @@ archive_write_new(void) int archive_write_set_bytes_per_block(struct archive *a, int bytes_per_block) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, "archive_write_set_bytes_per_block"); a->bytes_per_block = bytes_per_block; return (ARCHIVE_OK); } @@ -108,7 +108,7 @@ archive_write_set_bytes_per_block(struct archive *a, int bytes_per_block) int archive_write_set_bytes_in_last_block(struct archive *a, int bytes) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_set_bytes_in_last_block"); a->bytes_in_last_block = bytes; return (ARCHIVE_OK); } @@ -125,7 +125,7 @@ archive_write_open(struct archive *a, void *client_data, int ret; ret = ARCHIVE_OK; - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, "archive_write_open"); archive_string_empty(&a->error_string); a->state = ARCHIVE_STATE_HEADER; a->client_data = client_data; @@ -149,7 +149,7 @@ archive_write_open(struct archive *a, void *client_data, int archive_write_close(struct archive *a) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_close"); /* Finish the last entry. */ if (a->state & ARCHIVE_STATE_DATA) @@ -173,7 +173,7 @@ archive_write_close(struct archive *a) void archive_write_finish(struct archive *a) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_finish"); if (a->state != ARCHIVE_STATE_CLOSED) archive_write_close(a); @@ -193,8 +193,8 @@ archive_write_header(struct archive *a, struct archive_entry *entry) { int ret; - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, - ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, + ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA, "archive_write_header"); archive_string_empty(&a->error_string); /* Finish last entry. */ @@ -222,7 +222,7 @@ int archive_write_data(struct archive *a, const void *buff, size_t s) { int ret; - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); archive_string_empty(&a->error_string); ret = (a->format_write_data)(a, buff, s); return (ret == ARCHIVE_OK ? (ssize_t)s : -1); diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c index f56b798429aa..429cc155f456 100644 --- a/lib/libarchive/archive_write_set_compression_bzip2.c +++ b/lib/libarchive/archive_write_set_compression_bzip2.c @@ -68,7 +68,7 @@ static int drive_compressor(struct archive *, struct private_data *, int archive_write_set_compression_bzip2(struct archive *a) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, "archive_write_set_compression_bzip2"); a->compression_init = &archive_compressor_bzip2_init; a->compression_code = ARCHIVE_COMPRESSION_BZIP2; a->compression_name = "bzip2"; diff --git a/lib/libarchive/archive_write_set_compression_gzip.c b/lib/libarchive/archive_write_set_compression_gzip.c index 94a2626cfbe1..3229507a1996 100644 --- a/lib/libarchive/archive_write_set_compression_gzip.c +++ b/lib/libarchive/archive_write_set_compression_gzip.c @@ -70,7 +70,7 @@ static int drive_compressor(struct archive *, struct private_data *, int archive_write_set_compression_gzip(struct archive *a) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, "archive_write_set_compression_gzip"); a->compression_init = &archive_compressor_gzip_init; a->compression_code = ARCHIVE_COMPRESSION_GZIP; a->compression_name = "gzip"; diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c index d8fa396a8c85..2a6362994237 100644 --- a/lib/libarchive/archive_write_set_compression_none.c +++ b/lib/libarchive/archive_write_set_compression_none.c @@ -49,7 +49,7 @@ struct archive_none { int archive_write_set_compression_none(struct archive *a) { - archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW); + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, "archive_write_set_compression_none"); a->compression_init = &archive_compressor_none_init; a->compression_code = ARCHIVE_COMPRESSION_NONE; a->compression_name = "none"; |