diff options
| author | Stefan Esser <sesser@php.net> | 2002-12-24 23:30:51 +0000 |
|---|---|---|
| committer | Stefan Esser <sesser@php.net> | 2002-12-24 23:30:51 +0000 |
| commit | 00cc7629345ee432032d3c0c66b560b68c4a41b8 (patch) | |
| tree | 3c5bc62f8d30d115e6a4b02c291bb45824ba6b2f | |
| parent | 409f64d09dc524f496e9e4f59dc61223ee2fff06 (diff) | |
| download | php-git-00cc7629345ee432032d3c0c66b560b68c4a41b8.tar.gz | |
MFH
| -rw-r--r-- | ext/mime_magic/mime_magic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index d0ed717f88..84b21a10a5 100644 --- a/ext/mime_magic/mime_magic.c +++ b/ext/mime_magic/mime_magic.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Hartmut Holzgraefe <hartmut@six.de> | + | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ $Id$ @@ -274,7 +274,7 @@ PHP_MINIT_FUNCTION(mime_magic) PHP_MSHUTDOWN_FUNCTION(mime_magic) { UNREGISTER_INI_ENTRIES(); - if (mime_global.magic != NULL && (int)mime_global.magic != -1) { + if (mime_global.magic != NULL && mime_global.magic != (struct magic *) -1) { struct magic *iter = mime_global.magic; while (iter != NULL) { struct magic *iter_next = iter->next; @@ -312,7 +312,7 @@ PHP_FUNCTION(mime_content_type) return; } - if ((int) conf->magic == -1) { + if (conf->magic == (struct magic *)-1) { php_error(E_ERROR, MODNAME " could not be initialized, magic file %s is not avaliable", conf->magicfile); RETURN_FALSE; } @@ -358,7 +358,7 @@ static int apprentice(void) fname = conf->magicfile; /* todo cwd? */ f = fopen(fname, "rb"); if (f == NULL) { - *(int *)&conf->magic = -1; + conf->magic = (struct magic *)-1; return -1; } |