pajoye Wed, 03 Feb 2010 20:42:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294458
Log:
- fix wrong type and useless assignments
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 20:40:01 UTC (rev
294457)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 20:42:50 UTC (rev
294458)
@@ -3883,7 +3883,7 @@
long col = -1, x = -1, y = -1;
int str_len, fontname_len, i, brect[8];
double ptsize, angle;
- unsigned char *str = NULL, *fontname = NULL;
+ char *str = NULL, *fontname = NULL;
char *error = NULL;
int argc = ZEND_NUM_ARGS();
#if HAVE_GD_STRINGFTEX
@@ -3945,28 +3945,24 @@
{
char tmp_font_path[MAXPATHLEN];
- if (VCWD_REALPATH((char *)fontname, tmp_font_path)) {
- fontname = (unsigned char *) fontname;
- } else {
+ if (!VCWD_REALPATH(fontname, tmp_font_path)) {
fontname = NULL;
}
}
-#else
- fontname = (unsigned char *) fontname;
#endif
- PHP_GD_CHECK_OPEN_BASEDIR((char *)fontname, "Invalid font filename");
+ PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");
#ifdef USE_GD_IMGSTRTTF
# if HAVE_GD_STRINGFTEX
if (extended) {
- error = gdImageStringFTEx(im, brect, col, (char *)fontname,
ptsize, angle, x, y, (char *)str, &strex);
+ error = gdImageStringFTEx(im, brect, col, fontname, ptsize,
angle, x, y, str, &strex);
}
else
# endif
# if HAVE_GD_STRINGFT
- error = gdImageStringFT(im, brect, col, (char *)fontname, ptsize,
angle, x, y, (char *)str);
+ error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y,
str);
# elif HAVE_GD_STRINGTTF
error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y,
str);
# endif
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
