[evolvis-commits] r17273: make warning clean with php5-cli_5.3.6-11

mirabilos at evolvis.org mirabilos at evolvis.org
Thu May 19 12:11:58 CEST 2011


Author: mirabilos
Date: 2011-05-19 12:11:58 +0200 (Thu, 19 May 2011)
New Revision: 17273

Modified:
   trunk/gforge_base/evolvisforge/gforge/common/include/minijson.php
   trunk/gforge_base/evolvisforge/gforge/common/include/testjson.php
Log:
make warning clean with php5-cli_5.3.6-11


Modified: trunk/gforge_base/evolvisforge/gforge/common/include/minijson.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/minijson.php	2011-05-19 10:11:55 UTC (rev 17272)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/minijson.php	2011-05-19 10:11:58 UTC (rev 17273)
@@ -261,14 +261,14 @@
 			$p++;
 
 		/* parse recursively */
-		$rv = minijson_decode_value(&$j, &$p, &$ov, $depth);
+		$rv = minijson_decode_value($j, $p, $ov, $depth);
 	} else {
 		$ov = "input not valid UTF-8";
 	}
 
 	if ($rv) {
 		/* skip optional whitespace after tokens */
-		minijson_skip_wsp(&$j, &$p);
+		minijson_skip_wsp($j, $p);
 
 		/* end of string? */
 		if ($j[$p] !== 0) {
@@ -313,7 +313,7 @@
 	/* I wish there were a goto in PHP… */
 	while (true) {
 		/* skip optional whitespace between tokens */
-		minijson_skip_wsp(&$j, &$p);
+		minijson_skip_wsp($j, $p);
 
 		/* end of the array? */
 		if ($j[$p] == 0x5D) {
@@ -344,7 +344,7 @@
 
 		/* parse the member value */
 		$v = NULL;
-		if (!minijson_decode_value(&$j, &$p, &$v, $depth)) {
+		if (!minijson_decode_value($j, $p, $v, $depth)) {
 			/* pass through error code */
 			$ov = $v;
 			return false;
@@ -359,7 +359,7 @@
 
 	while (true) {
 		/* skip optional whitespace between tokens */
-		minijson_skip_wsp(&$j, &$p);
+		minijson_skip_wsp($j, $p);
 
 		/* end of the object? */
 		if ($j[$p] == 0x7D) {
@@ -389,7 +389,7 @@
 		$first = false;
 
 		/* skip optional whitespace between tokens */
-		minijson_skip_wsp(&$j, &$p);
+		minijson_skip_wsp($j, $p);
 
 		/* parse the member key */
 		if ($j[$p++] != 0x22) {
@@ -397,14 +397,14 @@
 			return false;
 		}
 		$k = null;
-		if (!minijson_decode_string(&$j, &$p, &$k)) {
+		if (!minijson_decode_string($j, $p, $k)) {
 			/* pass through error code */
 			$ov = $k;
 			return false;
 		}
 
 		/* skip optional whitespace between tokens */
-		minijson_skip_wsp(&$j, &$p);
+		minijson_skip_wsp($j, $p);
 
 		/* key-value separator? */
 		if ($j[$p++] != 0x3A) {
@@ -414,7 +414,7 @@
 
 		/* parse the member value */
 		$v = NULL;
-		if (!minijson_decode_value(&$j, &$p, &$v, $depth)) {
+		if (!minijson_decode_value($j, $p, $v, $depth)) {
 			/* pass through error code */
 			$ov = $v;
 			return false;
@@ -425,7 +425,7 @@
 
 function minijson_decode_value(&$j, &$p, &$ov, $depth) {
 	/* skip optional whitespace between tokens */
-	minijson_skip_wsp(&$j, &$p);
+	minijson_skip_wsp($j, $p);
 
 	/* parse begin of Value token */
 	$wc = $j[$p++];
@@ -463,19 +463,19 @@
 		$ov = "expected alse after f near wchar #" . $p;
 	} else if ($wc == 0x5B) {
 		if (--$depth > 0) {
-			return minijson_decode_array(&$j, &$p, &$ov, $depth);
+			return minijson_decode_array($j, $p, $ov, $depth);
 		}
 		$ov = "recursion limit exceeded at wchar #" . $p;
 	} else if ($wc == 0x7B) {
 		if (--$depth > 0) {
-			return minijson_decode_object(&$j, &$p, &$ov, $depth);
+			return minijson_decode_object($j, $p, $ov, $depth);
 		}
 		$ov = "recursion limit exceeded at wchar #" . $p;
 	} else if ($wc == 0x22) {
-		return minijson_decode_string(&$j, &$p, &$ov);
+		return minijson_decode_string($j, $p, $ov);
 	} else if ($wc == 0x2D || ($wc >= 0x30 && $wc <= 0x39)) {
 		$p--;
-		return minijson_decode_number(&$j, &$p, &$ov);
+		return minijson_decode_number($j, $p, $ov);
 	} else {
 		$ov = sprintf("unexpected U+%04X at wchar #%u", $wc, $p);
 	}
@@ -522,8 +522,8 @@
 				$v = 0;
 				for ($tmp = 1; $tmp <= 4; $tmp++) {
 					$v <<= 4;
-					if (!minijson_get_hexdigit(&$j, &$p,
-					    &$v, $tmp)) {
+					if (!minijson_get_hexdigit($j, $p,
+					    $v, $tmp)) {
 						/* pass through error code */
 						return false;
 					}

Modified: trunk/gforge_base/evolvisforge/gforge/common/include/testjson.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/testjson.php	2011-05-19 10:11:55 UTC (rev 17272)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/testjson.php	2011-05-19 10:11:58 UTC (rev 17273)
@@ -22,6 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+error_reporting(-1);
+
 /****************************************************************/
 
 /* $s_orig [parse] print_r->$s_printr [encode] $s_ecompact or $s_epadded */



More information about the evolvis-commits mailing list