cvs: php-src(PHP_5_3) /ext/exif exif.c

felipe Fri Jun 12 14:03:35 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/exif exif.c Log: - Dropped unnecessary var http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.15&r2=1.173.2.5.2.20.2.16&diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.15 php-src/ext/exif/exif.c:1.173.2.5.2.20.2.16 --- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.15 Thu May 28 13:45:15 2009 +++ php-src/ext/exif/exif.c Fri Jun 12 14:03:35 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.173.2.5.2.20.2.15 2009/05/28 13:45:15 pajoye Exp $ */ +/* $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12 14:03:35 felipe Exp $ */ /* ToDos * @@ -138,7 +138,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.15 2009/05/28 13:45:15 pajoye Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12 14:03:35 felipe Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -3913,17 +3913,17 @@ int p_name_len, p_sections_needed_len = 0; zend_bool sub_arrays=0, read_thumbnail=0, read_all=0; - int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0; + int i, ret, sections_needed=0; image_info_type ImageInfo; char tmp[64], *sections_str, *s; - if (zend_parse_parameters(ac TSRMLS_CC, "s|sbb", &p_name, &p_name_len, &p_sections_needed, &p_sections_needed_len, &sub_arrays, &read_thumbnail) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sbb", &p_name, &p_name_len, &p_sections_needed, &p_sections_needed_len, &sub_arrays, &read_thumbnail) == FAILURE) { return; } memset(&ImageInfo, 0, sizeof(ImageInfo)); - if (ac >= 2) { + if (p_sections_needed) { spprintf(&sections_str, 0, ",%s,", p_sections_needed); /* sections_str DOES start with , and SPACES are NOT allowed in names */ s = sections_str;