Skip to content

Commit 4824d0f

Browse files
committed
Merge branch 'PHP-5.5'
* PHP-5.5: Reduce compiler noise by removing unused variables and labels
2 parents 3c166c4 + cd14de9 commit 4824d0f

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

ext/gd/gd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
24422442
fflush(fp);
24432443
}
24442444

2445-
register_im:
2445+
/* register_im: */
24462446
if (im) {
24472447
ZEND_REGISTER_RESOURCE(return_value, im, le_gd);
24482448
php_stream_close(stream);

ext/gd/libgd/gd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3011,7 +3011,6 @@ void gdImageGetClip (gdImagePtr im, int *x1P, int *y1P, int *x2P, int *y2P)
30113011
int gdImagePaletteToTrueColor(gdImagePtr src)
30123012
{
30133013
unsigned int y;
3014-
unsigned char alloc_y = 0;
30153014
unsigned int yy;
30163015

30173016
if (src == NULL) {

ext/standard/url_scanner_ex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
10111011

10121012
PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
10131013
{
1014-
char *encoded;
1014+
char *encoded = NULL;
10151015
int encoded_len;
10161016
smart_str val;
10171017

0 commit comments

Comments
 (0)