cvs: php4 /ext/ctype ctype.c /ext/ming ming.c

sniper Wed Aug 22 05:20:39 2001 EDT Modified files: /php4/ext/ctype ctype.c /php4/ext/ming ming.c Log: More compile warnings nuked. Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.11 php4/ext/ctype/ctype.c:1.12 --- php4/ext/ctype/ctype.c:1.11 Sat Aug 11 12:38:21 2001 +++ php4/ext/ctype/ctype.c Wed Aug 22 05:20:39 2001 @@ -38,7 +38,7 @@ */ /* True global resources - no need for thread safety here */ -static int le_ctype; +/* static int le_ctype; */ /* {{{ ctype_functions[] * Every user visible function must have an entry in ctype_functions[]. Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.15 php4/ext/ming/ming.c:1.16 --- php4/ext/ming/ming.c:1.15 Sun Aug 19 23:32:42 2001 +++ php4/ext/ming/ming.c Wed Aug 22 05:20:39 2001 @@ -24,11 +24,12 @@ #endif #include "php.h" - -#if HAVE_MING +#include "php_ming.h" #include "ext/standard/info.h" #include "ext/standard/file.h" -#include "php_ming.h" +#include "ext/standard/fsock.h" + +#if HAVE_MING static zend_function_entry ming_functions[] = { PHP_FALIAS(ming_setcubicthreshold, ming_setCubicThreshold, NULL) @@ -180,6 +181,7 @@ return (SWFCharacter)getBitmap(id TSRMLS_CC); else php_error(E_ERROR, "called object is not an SWFCharacter"); + return NULL; } /* }}} */ @@ -210,7 +212,7 @@ buffer = realloc(buffer, alloced); } - l = php_sock_fread(buffer+offset, SOCKBUF_INCREMENT, socket); + l = SOCK_FREAD(buffer+offset, SOCKBUF_INCREMENT, socket); offset += l; } @@ -222,8 +224,7 @@ static SWFInput getInput(zval **zfile) { FILE *file; - int type, s, offset; - char *buffer; + int type; SWFInput input; file = (FILE *)zend_fetch_resource(zfile, -1, "File-Handle", &type, 3, @@ -312,7 +313,7 @@ zval **zfile, **zmask = NULL; SWFBitmap bitmap; SWFInput input, maskinput; - int ret, type; + int ret; if(ZEND_NUM_ARGS() == 1) { @@ -1312,7 +1313,7 @@ PHP_FUNCTION(swfgradient_addEntry) { - zval **ratio, **r, **g, **b, **za; + zval **ratio, **r, **g, **b; byte a = 0xff; if(ZEND_NUM_ARGS() == 4) @@ -1590,8 +1591,6 @@ { zval **x; SWFMovie movie = getMovie(getThis() TSRMLS_CC); - int type; - int le_fopen; void *what; if((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &x) == FAILURE) @@ -1710,7 +1709,6 @@ PHP_FUNCTION(swfmovie_streamMp3) { - FILE *file; zval **zfile; SWFSound sound; SWFInput input; @@ -3053,8 +3051,12 @@ { /* XXX - this didn't work so well last I tried.. */ - if(Ming_init() != 0) + if(Ming_init() != 0) { php_error(E_ERROR, "Error initializing Ming module"); + return FAILURE; + } + + return SUCCESS; } PHP_MINIT_FUNCTION(ming)