iliaa Sun Dec 31 22:47:27 2006 UTC
Modified files:
/php-src/ext/filter logical_filters.c
Log:
MFB: Simplify code and change strchr() to memchr()
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.23
php-src/ext/filter/logical_filters.c:1.24
--- php-src/ext/filter/logical_filters.c:1.23 Sat Dec 30 01:56:33 2006
+++ php-src/ext/filter/logical_filters.c Sun Dec 31 22:47:27 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.23 2006/12/30 01:56:33 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.24 2006/12/31 22:47:27 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -597,15 +597,12 @@
* allow_ipv4 and allow_ipv6 flags flag are used, then the first dot or
* colon determine the format */
- char *str = NULL;
int ip[4];
int mode;
- str = Z_STRVAL_P(value);
-
- if (strchr(str, ':')) {
+ if (memchr(Z_STRVAL_P(value), ':', Z_STRLEN_P(value))) {
mode = FORMAT_IPV6;
- } else if (strchr(str, '.')) {
+ } else if (memchr(Z_STRVAL_P(value), '.', Z_STRLEN_P(value))) {
mode = FORMAT_IPV4;
} else {
RETURN_VALIDATION_FAILED
@@ -621,7 +618,7 @@
switch (mode) {
case FORMAT_IPV4:
- if (!_php_filter_validate_ipv4(str, Z_STRLEN_P(value),
ip)) {
+ if (!_php_filter_validate_ipv4(Z_STRVAL_P(value),
Z_STRLEN_P(value), ip)) {
RETURN_VALIDATION_FAILED
}
@@ -651,7 +648,7 @@
case FORMAT_IPV6:
{
int res = 0;
- res = _php_filter_validate_ipv6(str,
Z_STRLEN_P(value) TSRMLS_CC);
+ res =
_php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value) TSRMLS_CC);
if (res < 1) {
RETURN_VALIDATION_FAILED
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
