cvs: php4 /ext/mime_magic mime_magic.c

moriyoshi Thu Jan 9 23:37:26 2003 EDT Modified files: /php4/ext/mime_magic mime_magic.c Log: Reduced compiler warnings Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.22 php4/ext/mime_magic/mime_magic.c:1.23 --- php4/ext/mime_magic/mime_magic.c:1.22 Tue Dec 31 11:06:57 2002 +++ php4/ext/mime_magic/mime_magic.c Thu Jan 9 23:37:26 2003 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.22 2002/12/31 16:06:57 sebastian Exp $ + $Id: mime_magic.c,v 1.23 2003/01/10 04:37:26 moriyoshi 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: @@ -1425,7 +1425,7 @@ { long offset = m->offset; - if (offset + sizeof(union VALUETYPE) > nbytes) + if (offset + (long)sizeof(union VALUETYPE) > nbytes) return 0; memcpy(p, s + offset, sizeof(union VALUETYPE)); @@ -1447,7 +1447,7 @@ break; } - if (offset + sizeof(union VALUETYPE) > nbytes) + if (offset + (long)sizeof(union VALUETYPE) > nbytes) return 0; memcpy(p, s + offset, sizeof(union VALUETYPE));