[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src /ext/pcre php_pcre.c  /ext/simplexml simplexml.c  /main php_variables.c
From:       "Kalle Sommer Nielsen" <kalle () php ! net>
Date:       2009-03-30 14:21:03
Message-ID: cvskalle1238422863 () cvsserver
[Download RAW message or body]

kalle		Mon Mar 30 14:21:03 2009 UTC

  Modified files:              
    /php-src/ext/pcre	php_pcre.c 
    /php-src/ext/simplexml	simplexml.c 
    /php-src/main	php_variables.c 
  Log:
  Fixed Windows build, declarations first ladies and gentlemen
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.249&r2=1.250&diff_format=u
                
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.249 php-src/ext/pcre/php_pcre.c:1.250
--- php-src/ext/pcre/php_pcre.c:1.249	Fri Mar 27 19:28:26 2009
+++ php-src/ext/pcre/php_pcre.c	Mon Mar 30 14:21:03 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.249 2009/03/27 19:28:26 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.250 2009/03/30 14:21:03 kalle Exp $ */
 
 /*  TODO
  *  php_pcre_replace_impl():
@@ -515,10 +515,10 @@
 	add_next_index_long(match_pair, prev->cp_offset);
 	
 	if (name) {
-		zval_add_ref(&match_pair);
 		UErrorCode status = U_ZERO_ERROR;
 		UChar *u = NULL;
 		int u_len;
+		zval_add_ref(&match_pair);
 		zend_string_to_unicode_ex(UG(utf8_conv), &u, &u_len, name, strlen(name), &status);
 		zend_u_hash_update(Z_ARRVAL_P(result), IS_UNICODE, ZSTR(u), u_len+1, &match_pair, \
sizeof(zval *), NULL);  efree(u);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.274&r2=1.275&diff_format=u
                
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.274 \
                php-src/ext/simplexml/simplexml.c:1.275
--- php-src/ext/simplexml/simplexml.c:1.274	Thu Mar 26 20:02:12 2009
+++ php-src/ext/simplexml/simplexml.c	Mon Mar 30 14:21:03 2009
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simplexml.c,v 1.274 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: simplexml.c,v 1.275 2009/03/30 14:21:03 kalle Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1089,6 +1089,9 @@
 		while (attr) {
 			if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && match_ns(sxe, \
(xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {  xmlChar *tmp;
+				UErrorCode status = U_ZERO_ERROR;
+				zstr u_name;
+				int u_name_len;
 
 				MAKE_STD_ZVAL(value);
 				tmp = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1);
@@ -1100,9 +1103,6 @@
 					array_init(zattr);
 					sxe_properties_add(rv, "@attributes", sizeof("@attributes"), zattr TSRMLS_CC);
 				}
-				UErrorCode status = U_ZERO_ERROR;
-				zstr u_name;
-				int u_name_len;
 				zend_string_to_unicode_ex(UG(utf8_conv), &u_name.u, &u_name_len, \
(char*)attr->name, namelen, &status);  add_u_assoc_zval_ex(zattr, IS_UNICODE, u_name, \
u_name_len, value);  efree(u_name.u);
@@ -2385,6 +2385,8 @@
 	xmlNodePtr curnode = NULL;
 	php_sxe_object *intern;
 	int namelen;
+	UErrorCode status = U_ZERO_ERROR;
+	int u_len;
 
 	php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
 	curobj = iterator->sxe->iter.data;
@@ -2397,9 +2399,6 @@
 		return HASH_KEY_NON_EXISTANT;
 	}
 
-	UErrorCode status = U_ZERO_ERROR;
-	int u_len;
-
 	namelen = xmlStrlen(curnode->name);
 	zend_string_to_unicode_ex(UG(utf8_conv), &str_key->u, &u_len, (char*)curnode->name, \
                namelen, &status);
 	*str_key_len = u_len + 1;
@@ -2617,7 +2616,7 @@
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Simplexml support", "enabled");
-	php_info_print_table_row(2, "Revision", "$Revision: 1.274 $");
+	php_info_print_table_row(2, "Revision", "$Revision: 1.275 $");
 	php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
 		"enabled");
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.153&r2=1.154&diff_format=u
                
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.153 php-src/main/php_variables.c:1.154
--- php-src/main/php_variables.c:1.153	Thu Mar 26 20:02:53 2009
+++ php-src/main/php_variables.c	Mon Mar 30 14:21:03 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_variables.c,v 1.153 2009/03/26 20:02:53 felipe Exp $ */
+/* $Id: php_variables.c,v 1.154 2009/03/30 14:21:03 kalle Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -531,6 +531,9 @@
 	
 	while (var) {
 		int var_len;
+		UChar *u_var, *u_val;
+		int u_var_len, u_val_len;
+		UErrorCode status = U_ZERO_ERROR;
 
 		val = strchr(var, '=');
 
@@ -550,10 +553,6 @@
 		var_len = strlen(var);
 		php_url_decode(var, var_len);
 
-		UChar *u_var, *u_val;
-		int u_var_len, u_val_len;
-		UErrorCode status = U_ZERO_ERROR;
-
 		zend_string_to_unicode_ex(input_conv, &u_var, &u_var_len, var, var_len, &status);
 		if (U_FAILURE(status)) {
 			/* UTODO set a user-accessible flag to indicate that conversion failed? */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]