github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: Use 'int' not 'char' for status return types.

Browse Source 
Fix a const mistake.
This commit is contained in:
Tim Kientzle committed 2013-12-19 21:38:53 -08:00
1 parent 22d76265e4
commit cd1740912b
7 files changed
+15 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libarchive/archive.h
+1 -1
View File
@@ -521,7 +521,7 @@ __LA_DECL __LA_INT64_T archive_read_header_position(struct archive *);
* function does not return the number of encrypted entries but#
* just shows that there are some.
*/
__LA_DECL char archive_read_has_encrypted_entries(struct archive *);
__LA_DECL int archive_read_has_encrypted_entries(struct archive *);
/*
* Returns a bitmask of capabilities that are supported by the archive format reader.
libarchive/archive_read.c
+2 -2
View File
@@ -764,7 +764,7 @@ archive_read_header_position(struct archive *_a)
* function does not return the number of encrypted entries but#
* just shows that there are some.
*/
char
int
archive_read_has_encrypted_entries(struct archive *_a)
{
struct archive_read *a = (struct archive_read *)_a;
@@ -1149,7 +1149,7 @@ __archive_read_register_format(struct archive_read *a,
int64_t (*seek_data)(struct archive_read *, int64_t, int),
int (*cleanup)(struct archive_read *),
int (*format_capabilities)(struct archive_read *),
char (*has_encrypted_entries)(struct archive_read *))
int (*has_encrypted_entries)(struct archive_read *))
{
int i, number_slots;
libarchive/archive_read_private.h
+2 -2
View File
@@ -208,7 +208,7 @@ struct archive_read {
int64_t (*seek_data)(struct archive_read *, int64_t, int);
int (*cleanup)(struct archive_read *);
int (*format_capabilties)(struct archive_read *);
char (*has_encrypted_entries)(struct archive_read *);
int (*has_encrypted_entries)(struct archive_read *);
} formats[16];
struct archive_format_descriptor *format; /* Active format. */
@@ -230,7 +230,7 @@ int __archive_read_register_format(struct archive_read *a,
int64_t (*seek_data)(struct archive_read *, int64_t, int),
int (*cleanup)(struct archive_read *),
int (*format_capabilities)(struct archive_read *),
char (*has_encrypted_entries)(struct archive_read *));
int (*has_encrypted_entries)(struct archive_read *));
int __archive_read_get_bidder(struct archive_read *a,
struct archive_read_filter_bidder **bidder);
libarchive/archive_read_support_format_7zip.c
+4 -3
View File
@@ -328,10 +328,10 @@ struct _7zip {
char format_name[64];
/* Custom value that is non-zero if this archive contains encrypted entries. */
char has_encrypted_entries;
char has_encrypted_entries;
};
static char archive_read_format_7zip_has_encrypted_entries(struct archive_read *);
static int archive_read_format_7zip_has_encrypted_entries(struct archive_read *);
static int archive_read_support_format_7zip_capabilities(struct archive_read *a);
static int archive_read_format_7zip_bid(struct archive_read *, int);
static int archive_read_format_7zip_cleanup(struct archive_read *);
@@ -444,7 +444,8 @@ archive_read_support_format_7zip_capabilities(struct archive_read * a)
}
static char archive_read_format_7zip_has_encrypted_entries(struct archive_read *_a)
static int
archive_read_format_7zip_has_encrypted_entries(struct archive_read *_a)
{
if (_a && _a->format) {
struct _7zip * zip = (struct _7zip *)_a->format->data;
libarchive/archive_read_support_format_rar.c
+3 -2
View File
@@ -312,7 +312,7 @@ struct rar
};
static int archive_read_support_format_rar_capabilities(struct archive_read *);
static char archive_read_format_rar_has_encrypted_entries(struct archive_read *);
static int archive_read_format_rar_has_encrypted_entries(struct archive_read *);
static int archive_read_format_rar_bid(struct archive_read *, int);
static int archive_read_format_rar_options(struct archive_read *,
const char *, const char *);
@@ -685,7 +685,8 @@ archive_read_support_format_rar_capabilities(struct archive_read * a)
| ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
}
static char archive_read_format_rar_has_encrypted_entries(struct archive_read *_a)
static int
archive_read_format_rar_has_encrypted_entries(struct archive_read *_a)
{
if (_a && _a->format) {
struct rar * rar = (struct rar *)_a->format->data;
libarchive/archive_read_support_format_zip.c
+2 -2
View File
@@ -129,7 +129,7 @@ struct zip {
#define ZIP_CENTRAL_DIRECTORY_ENCRYPTED (1<<13)
#define ZIP_UTF8_NAME (1<<11)
static char archive_read_format_zip_has_encrypted_entries(struct archive_read *);
static int archive_read_format_zip_has_encrypted_entries(struct archive_read *);
static int archive_read_support_format_zip_capabilities_seekable(struct archive_read *a);
static int archive_read_support_format_zip_capabilities_streamable(struct archive_read *a);
static int archive_read_format_zip_streamable_bid(struct archive_read *,
@@ -263,7 +263,7 @@ archive_read_support_format_zip_capabilities_streamable(struct archive_read * a)
}
static char
static int
archive_read_format_zip_has_encrypted_entries(struct archive_read *_a)
{
if (_a && _a->format) {
libarchive/archive_util.c
+1 -1
View File
@@ -106,7 +106,7 @@ archive_version_details(void)
#ifdef HAVE_BZLIB_H
{
const char *p = BZ2_bzlibVersion();
char *sep = strchr(p, ',');
const char *sep = strchr(p, ',');
if (sep == NULL)
sep = p + strlen(p);
archive_strcat(&str, " bz2lib/");