cvs: php4 /ext/mime_magic mime_magic.c php_mime_magic.h
| From: | Hartmut Holzgraefe | Date: | Wed, 27 Mar 2002 13:51:55 +0000 |
| Subject: | cvs: php4 /ext/mime_magic mime_magic.c php_mime_magic.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10714@lists.php.net to get a copy of this message | ||
hholzgra Wed Mar 27 08:51:55 2002 EDT
Modified files:
/php4/ext/mime_magic mime_magic.c php_mime_magic.h
Log:
moved 'static' prototypes to prevent warnings
Index: php4/ext/mime_magic/mime_magic.c
diff -u php4/ext/mime_magic/mime_magic.c:1.3 php4/ext/mime_magic/mime_magic.c:1.4
--- php4/ext/mime_magic/mime_magic.c:1.3 Wed Mar 27 06:56:42 2002
+++ php4/ext/mime_magic/mime_magic.c Wed Mar 27 08:51:55 2002
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <hartmut@six.de> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.3 2002/03/27 11:56:42 hholzgra Exp $
+ $Id: mime_magic.c,v 1.4 2002/03/27 13:51:55 hholzgra Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the lincense section is a little bit longer than usual:
@@ -162,6 +162,37 @@
#include <unistd.h>
#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)
Index: php4/ext/mime_magic/php_mime_magic.h
diff -u php4/ext/mime_magic/php_mime_magic.h:1.3 php4/ext/mime_magic/php_mime_magic.h:1.4
--- php4/ext/mime_magic/php_mime_magic.h:1.3 Wed Mar 27 06:56:42 2002
+++ php4/ext/mime_magic/php_mime_magic.h Wed Mar 27 08:51:55 2002
@@ -15,7 +15,7 @@
| Author: |
+----------------------------------------------------------------------+
- $Id: php_mime_magic.h,v 1.3 2002/03/27 11:56:42 hholzgra Exp $
+ $Id: php_mime_magic.h,v 1.4 2002/03/27 13:51:55 hholzgra Exp $
*/
#ifndef PHP_MIME_MAGIC_H
@@ -135,34 +135,6 @@
#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 @@
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 *);