Merge branch 'hotfix/fix_return_values'

michael-grunder · michael-grunder · commit 5e5fa7895f14 · 2013-02-24T17:52:39.000-08:00
diff --git a/library.c b/library.c
@@ -1093,7 +1093,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
         } else {
-            RETURN_FALSE;
+            RETVAL_FALSE;
         }
         return -1;
     }
@@ -1140,7 +1140,7 @@ PHPAPI int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, Red
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
         } else {
-            RETURN_FALSE;
+            RETVAL_FALSE;
         }
         return -1;
     }
@@ -1219,7 +1219,7 @@ PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, R
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
         } else {
-            RETURN_FALSE;
+            RETVAL_FALSE;
         }
         return -1;
     }

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo`
`1093`	`1093`	`IF_MULTI_OR_PIPELINE() {`
`1094`	`1094`	`add_next_index_bool(z_tab, 0);`
`1095`	`1095`	`} else {`
`1096`		`- RETURN_FALSE;`
	`1096`	`+ RETVAL_FALSE;`
`1097`	`1097`	`}`
`1098`	`1098`	`return -1;`
`1099`	`1099`	`}`
`@@ -1140,7 +1140,7 @@ PHPAPI int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, Red`
`1140`	`1140`	`IF_MULTI_OR_PIPELINE() {`
`1141`	`1141`	`add_next_index_bool(z_tab, 0);`
`1142`	`1142`	`} else {`
`1143`		`- RETURN_FALSE;`
	`1143`	`+ RETVAL_FALSE;`
`1144`	`1144`	`}`
`1145`	`1145`	`return -1;`
`1146`	`1146`	`}`
`@@ -1219,7 +1219,7 @@ PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, R`
`1219`	`1219`	`IF_MULTI_OR_PIPELINE() {`
`1220`	`1220`	`add_next_index_bool(z_tab, 0);`
`1221`	`1221`	`} else {`
`1222`		`- RETURN_FALSE;`
	`1222`	`+ RETVAL_FALSE;`
`1223`	`1223`	`}`
`1224`	`1224`	`return -1;`
`1225`	`1225`	`}`