cvs: php4 /ext/standard image.c

sniper Fri Apr 20 08:37:56 2001 EDT Modified files: /php4/ext/standard image.c Log: ws pollution removed. Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.28 php4/ext/standard/image.c:1.29 --- php4/ext/standard/image.c:1.28 Sun Feb 25 22:07:17 2001 +++ php4/ext/standard/image.c Fri Apr 20 08:37:55 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.28 2001/02/26 06:07:17 andi Exp $ */ +/* $Id: image.c,v 1.29 2001/04/20 15:37:55 sniper Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -235,7 +235,7 @@ length = php_read2(socketd,fp,issock); length -= 2; /* length includes itself */ - buffer = emalloc(length); + buffer = emalloc(length); if (FP_FREAD(buffer, (long) length, socketd, fp, issock) <= 0) { efree(buffer); @@ -281,7 +281,7 @@ result = (struct gfxinfo *) ecalloc(1,sizeof(struct gfxinfo)); FP_FREAD(tmp, sizeof(tmp), socketd, fp, issock); result->bits = FP_FGETC(socketd,fp,issock); - FP_FREAD(a, sizeof(a), socketd, fp, issock); + FP_FREAD(a, sizeof(a), socketd, fp, issock); result->height = (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]); result->width = (((unsigned short) a[ 2 ]) << 8) + ((unsigned short) a[ 3 ]); result->channels = FP_FGETC(socketd,fp,issock); @@ -312,7 +312,7 @@ if (info) { php_read_APP(socketd,fp,issock,marker,info); /* read all the app markes... */ } else { - php_skip_variable(socketd,fp,issock); + php_skip_variable(socketd,fp,issock); } break; @@ -344,7 +344,8 @@ char temp[64]; struct gfxinfo *result = NULL; - switch(ZEND_NUM_ARGS()){ + switch(ZEND_NUM_ARGS()) { + case 1: if (zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -357,9 +358,9 @@ WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 2)) { - php_error(E_WARNING, "Array to be filled with values must be passed by reference."); - RETURN_FALSE; - } + php_error(E_WARNING, "Array to be filled with values must be passed by reference."); + RETURN_FALSE; + } zval_dtor(*info);