diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 15:20:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 15:20:05 +0200 |
| commit | b65cb7e2aa298ef316b5b8a46d918868e5a793a2 (patch) | |
| tree | 26f3dd9adff5e0235c29d718c1a24649c51d7858 /ext/fileinfo/libmagic | |
| parent | f6521659ca9c8dc668ea60d3627a2f1a14cd5773 (diff) | |
| download | php-git-b65cb7e2aa298ef316b5b8a46d918868e5a793a2.tar.gz | |
Fix libmagic warnings
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 7 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/compress.c | 2 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/magic.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 94e4302d61..3355d3cc1e 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -145,10 +145,7 @@ private uint16_t swap2(uint16_t); private uint32_t swap4(uint32_t); private uint64_t swap8(uint64_t); private char *mkdbname(struct magic_set *, const char *, int); -private struct magic_map *apprentice_buf(struct magic_set *, struct magic *, - size_t); private struct magic_map *apprentice_map(struct magic_set *, const char *); -private int check_buffer(struct magic_set *, struct magic_map *, const char *); private void apprentice_unmap(struct magic_map *); private int apprentice_compile(struct magic_set *, struct magic_map *, const char *); @@ -2925,6 +2922,7 @@ eatsize(const char **p) *p = l; } +#if 0 /* * handle a buffer containing a compiled file. */ @@ -2946,6 +2944,7 @@ apprentice_buf(struct magic_set *ms, struct magic *buf, size_t len) } return map; } +#endif /* * handle a compiled file. @@ -3095,6 +3094,7 @@ error: return NULL; } +#if 0 private int check_buffer(struct magic_set *ms, struct magic_map *map, const char *dbname) { @@ -3150,6 +3150,7 @@ check_buffer(struct magic_set *ms, struct magic_map *map, const char *dbname) byteswap(map->magic[i], map->nmagic[i]); return 0; } +#endif /* * handle an mmaped file. diff --git a/ext/fileinfo/libmagic/compress.c b/ext/fileinfo/libmagic/compress.c index 024b569ac2..a66cf806bc 100644 --- a/ext/fileinfo/libmagic/compress.c +++ b/ext/fileinfo/libmagic/compress.c @@ -71,6 +71,7 @@ typedef void (*sig_t)(int); #define lrzip_flags "-do" #define lzip_flags gzip_flags +#ifdef PHP_FILEINFO_UNCOMPRESS static const char *gzip_args[] = { "gzip", gzip_flags, NULL }; @@ -122,6 +123,7 @@ private const struct { { RCAST(const void *, zlibcmp), 0, zlib_args }, /* zlib */ #endif }; +#endif #define OKDATA 0 #define NODATA 1 diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c index 51570c2a37..1cff11a5c0 100644 --- a/ext/fileinfo/libmagic/magic.c +++ b/ext/fileinfo/libmagic/magic.c @@ -76,8 +76,6 @@ FILE_RCSID("@(#)$File: magic.c,v 1.102 2017/08/28 13:39:18 christos Exp $") # undef S_IFIFO #endif -private void close_and_restore(const struct magic_set *, const char *, int, - const zend_stat_t *); private int unreadable_info(struct magic_set *, mode_t, const char *); #if 0 private const char* get_default_magic(void); @@ -157,6 +155,7 @@ magic_list(struct magic_set *ms, const char *magicfile) return file_apprentice(ms, magicfile, FILE_LIST); } +#if 0 private void close_and_restore(const struct magic_set *ms, const char *name, int fd, const zend_stat_t *sb) @@ -189,6 +188,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd, #endif } } +#endif /* |