Fix [-Wunused-variable] [-Wparentheses]

defercc · Jan 8, 2014 · 3a1f02e · 3a1f02e
1 parent 75cb392
commit 3a1f02e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/routes/yaf_route_map.c b/routes/yaf_route_map.c
@@ -201,7 +201,7 @@ zval * yaf_route_map_assemble(yaf_route_t *this_ptr, zval *mvc, zval *query TSRM
 		efree(pname);
 
 		if (IS_ARRAY == Z_TYPE_P(query)) {
-			uint key_type, key_len, i = 0;
+			uint key_len, i = 0;
 			char *key;
 			ulong key_idx;
 			zval **tmp_data;
@@ -277,7 +277,7 @@ PHP_METHOD(yaf_route_map, assemble) {
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|a", &mvc, &query) == FAILURE) {
         return;
     } else {
-        if (return_uri = yaf_route_map_assemble(getThis(), mvc, query TSRMLS_CC)) {
+        if ((return_uri = yaf_route_map_assemble(getThis(), mvc, query TSRMLS_CC))) {
             RETURN_ZVAL(return_uri, 0, 1);
         }
     }

diff --git a/routes/yaf_route_regex.c b/routes/yaf_route_regex.c
@@ -193,7 +193,7 @@ zval * yaf_route_regex_assemble(yaf_route_t *this_ptr, zval *mvc, zval *query TS
 	}
 
 	if (IS_ARRAY == Z_TYPE_P(query)) {
-		uint key_type, key_len;
+		uint key_len;
 		char *key;
 		ulong key_idx;
 		HashTable *ht = Z_ARRVAL_P(query);
@@ -364,7 +364,7 @@ PHP_METHOD(yaf_route_regex, assemble) {
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|a", &mvc, &query) == FAILURE) {
 		return;
 	} else {
-		if (return_uri = yaf_route_regex_assemble(getThis(), mvc, query TSRMLS_CC)) {
+		if ((return_uri = yaf_route_regex_assemble(getThis(), mvc, query TSRMLS_CC))) {
 			RETURN_ZVAL(return_uri, 0, 1);
 		}
 	}

diff --git a/routes/yaf_route_rewrite.c b/routes/yaf_route_rewrite.c
@@ -270,7 +270,7 @@ PHP_METHOD(yaf_route_rewrite, route) {
 /** {{{ zval * yaf_route_rewrite_assemble(yaf_route_t *this_ptr, zval *idents, zval *query TSRMLS_DC)
  */
 zval * yaf_route_rewrite_assemble(yaf_route_t *this_ptr, zval *idents, zval *query TSRMLS_DC) {
-	zval *reverse, *uri, *match, *pidents;
+	zval *uri, *match, *pidents;
 	zval **tmp;
 	char *tstr, *inter, *seg, *pmatch, *ptrptr, *key;
 	int tlen;
@@ -331,7 +331,6 @@ zval * yaf_route_rewrite_assemble(yaf_route_t *this_ptr, zval *idents, zval *que
 	zval_ptr_dtor(&pidents);
 
 	if (IS_ARRAY == Z_TYPE_P(query)) {
-		uint key_type;
 		HashTable *ht = Z_ARRVAL_P(query);
 
 		smart_str_appendc(&squery, '?');

diff --git a/routes/yaf_route_supervar.c b/routes/yaf_route_supervar.c
@@ -138,7 +138,7 @@ zval * yaf_route_supervar_assemble(yaf_route_t *this_ptr, zval *mvc, zval *query
 		smart_str_appendl(&tvalue, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
 
 		if (IS_ARRAY == Z_TYPE_P(query)) {
-			uint key_type, key_len;
+			uint key_len;
 			char *key;
 			ulong key_idx;
 
@@ -197,7 +197,7 @@ PHP_METHOD(yaf_route_supervar, assemble) {
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|a", &mvc, &query) == FAILURE) {
         return;
     } else {
-        if (return_uri = yaf_route_supervar_assemble(getThis(), mvc, query TSRMLS_CC)) {
+        if ((return_uri = yaf_route_supervar_assemble(getThis(), mvc, query TSRMLS_CC))) {
             RETURN_ZVAL(return_uri, 0, 1);
         }
     }