mattwil Tue Mar 31 11:22:19 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter logical_filters.c
Log:
- MFH: Removed unused LONG_SIGN_MASK definition, and a stray \
- Changed sign flag to int (it's no longer being used in a calculation)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.32&r2=1.1.2.33&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.32
php-src/ext/filter/logical_filters.c:1.1.2.33
--- php-src/ext/filter/logical_filters.c:1.1.2.32 Tue Mar 31 10:05:37 2009
+++ php-src/ext/filter/logical_filters.c Tue Mar 31 11:22:19 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.1.2.32 2009/03/31 10:05:37 dmitry Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.33 2009/03/31 11:22:19 mattwil Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -30,8 +30,6 @@
# include <arpa/inet.h>
#endif
-#define LONG_SIGN_MASK (1L << (8*sizeof(long)-1))
-
#ifndef INADDR_NONE
# define INADDR_NONE ((unsigned long int) -1)
#endif
@@ -70,7 +68,7 @@
static int php_filter_parse_int(const char *str, unsigned int str_len, long
*ret TSRMLS_DC) { /* {{{ */
long ctx_value;
- long sign = 0;
+ int sign = 0;
const char *end = str + str_len;
switch (*str) {
@@ -97,7 +95,7 @@
while (str < end) {
if (*str >= '0' && *str <= '9') {
- ctx_value = (ctx_value * 10) + (*(str++) - '0');
\
+ ctx_value = (ctx_value * 10) + (*(str++) - '0');
} else {
return -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
