cvs: php-src /ext/mime_magic mime_magic.c

hholzgra Fri Sep 26 03:47:01 2003 EDT Modified files: /php-src/ext/mime_magic mime_magic.c Log: compiler warning fixes, one of them a potential crash bug Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.31 php-src/ext/mime_magic/mime_magic.c:1.32 --- php-src/ext/mime_magic/mime_magic.c:1.31 Tue Aug 19 18:13:01 2003 +++ php-src/ext/mime_magic/mime_magic.c Fri Sep 26 03:47:01 2003 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.31 2003/08/19 22:13:01 iliaa Exp $ + $Id: mime_magic.c,v 1.32 2003/09/26 07:47:01 hholzgra Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -182,7 +182,7 @@ static int apprentice(void); static int ascmagic(unsigned char *, int); -static int is_tar(unsigned char *, int); +static int is_tar(unsigned char *, unsigned int); static int softmagic(unsigned char *, int); static void tryit(unsigned char *, int, int); @@ -576,7 +576,7 @@ t = l; if (*t++ != ')') { if(MIME_MAGIC_G(debug)) - php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_WARNING, ": (%s:%s) missing ')' in indirect offset", MIME_MAGIC_G(magicfile), lineno); + php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_WARNING, ": (%s:%d) missing ')' in indirect offset", MIME_MAGIC_G(magicfile), lineno); } l = t; } @@ -1460,7 +1460,7 @@ * old UNIX tar file, 2 for Unix Std (POSIX) tar file. */ -static int is_tar(unsigned char *buf, int nbytes) +static int is_tar(unsigned char *buf, unsigned int nbytes) { register union record *header = (union record *) buf; register int i;