diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2002-03-27 13:51:55 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2002-03-27 13:51:55 +0000 |
| commit | aba71d94e008cb1f8ac655f44ecd793615a4ce1f (patch) | |
| tree | aa17aff21056eb4b3ceec909e3709fa7130b497f /ext/mime_magic | |
| parent | 65f93ba4f7ef12ef511aa45141df7e9a84443e90 (diff) | |
| download | php-git-aba71d94e008cb1f8ac655f44ecd793615a4ce1f.tar.gz | |
moved 'static' prototypes to prevent warnings
Diffstat (limited to 'ext/mime_magic')
| -rw-r--r-- | ext/mime_magic/mime_magic.c | 31 | ||||
| -rw-r--r-- | ext/mime_magic/php_mime_magic.h | 30 |
2 files changed, 31 insertions, 30 deletions
diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index e7fe44c364..29b8edf525 100644 --- a/ext/mime_magic/mime_magic.c +++ b/ext/mime_magic/mime_magic.c @@ -163,6 +163,37 @@ #define MODNAME "mime_magic" +static int apprentice(void); +static int ascmagic(unsigned char *, int); +static int is_tar(unsigned char *, int); +static int softmagic(unsigned char *, int); +static void tryit(unsigned char *, int, int); + +static int getvalue(struct magic *, char **); +static int hextoint(int); +static char *getstr(char *, char *, int, int *); +static int parse(char *, int); + +static int match(unsigned char *, int); +static int mget(union VALUETYPE *, unsigned char *, + struct magic *, int); +static int mcheck(union VALUETYPE *, struct magic *); +static void mprint(union VALUETYPE *, struct magic *); +static int mconvert(union VALUETYPE *, struct magic *); +static int magic_rsl_get(char **, char **); +static int magic_process(char *); + +static long from_oct(int, char *); +static int fsmagic(const char *fn); + + +#if HAVE_ZLIB +static int zmagic(unsigned char *, int); +#endif + +static magic_req_rec *magic_set_config(void); +static void magic_free_config(magic_req_rec *); + ZEND_DECLARE_MODULE_GLOBALS(mime_magic) diff --git a/ext/mime_magic/php_mime_magic.h b/ext/mime_magic/php_mime_magic.h index 42c13d5711..30fc69382e 100644 --- a/ext/mime_magic/php_mime_magic.h +++ b/ext/mime_magic/php_mime_magic.h @@ -135,34 +135,6 @@ union record { #define pool void #define cmd_parms void -static int apprentice(void); -static int ascmagic(unsigned char *, int); -static int is_tar(unsigned char *, int); -static int softmagic(unsigned char *, int); -static void tryit(unsigned char *, int, int); - -static int getvalue(struct magic *, char **); -static int hextoint(int); -static char *getstr(char *, char *, int, int *); -static int parse(char *, int); - -static int match(unsigned char *, int); -static int mget(union VALUETYPE *, unsigned char *, - struct magic *, int); -static int mcheck(union VALUETYPE *, struct magic *); -static void mprint(union VALUETYPE *, struct magic *); -static int mconvert(union VALUETYPE *, struct magic *); -static int magic_rsl_get(char **, char **); -static int magic_process(char *); - -static long from_oct(int, char *); -static int fsmagic(const char *fn); - - -#if HAVE_ZLIB -static int zmagic(unsigned char *, int); -#endif - /* * includes for ASCII substring recognition formerly "names.h" in file * command @@ -394,8 +366,6 @@ typedef struct { unsigned suf_recursion; /* recursion depth in suffix check */ } magic_req_rec; -static magic_req_rec *magic_set_config(void); -static void magic_free_config(magic_req_rec *); |