Get rid of unnecessary USED_RET()s

Author: kocsismate

ext/xmlrpc/xmlrpc-epi-php.c

@@ -635,32 +635,30 @@ PHP_FUNCTION(xmlrpc_encode_request)
 
 	set_output_options(&out, out_opts ? out_opts : 0);
 
-	if (USED_RET()) {
-		xRequest = XMLRPC_RequestNew();
+	xRequest = XMLRPC_RequestNew();
 
-		if (xRequest) {
-			XMLRPC_RequestSetOutputOptions(xRequest, &out.xmlrpc_out);
-			if (method == NULL) {
-				XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_response);
-			} else {
-				XMLRPC_RequestSetMethodName(xRequest, method);
-				XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_call);
-			}
-			if (Z_TYPE_P(vals) != IS_NULL) {
-				XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(vals));
-			}
+	if (xRequest) {
+		XMLRPC_RequestSetOutputOptions(xRequest, &out.xmlrpc_out);
+		if (method == NULL) {
+			XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_response);
+		} else {
+			XMLRPC_RequestSetMethodName(xRequest, method);
+			XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_call);
+		}
+		if (Z_TYPE_P(vals) != IS_NULL) {
+			XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(vals));
+		}
 
-			outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
-			if (outBuf) {
-				RETVAL_STRING(outBuf);
+		outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
+		if (outBuf) {
+			RETVAL_STRING(outBuf);
 #ifdef HAVE_XMLRPC_BUNDLED
-				efree(outBuf);
+			efree(outBuf);
 #else
-				free(outBuf);
+			free(outBuf);
 #endif
-			}
-			XMLRPC_RequestFree(xRequest, 1);
 		}
+		XMLRPC_RequestFree(xRequest, 1);
 	}
 
 	if (strcmp(out.xmlrpc_out.xml_elem_opts.encoding, ENCODING_DEFAULT) != 0) {
@@ -681,25 +679,23 @@ PHP_FUNCTION(xmlrpc_encode)
 		RETURN_THROWS();
 	}
 
-	if (USED_RET()) {
-		/* convert native php type to xmlrpc type */
-		xOut = PHP_to_XMLRPC(arg1);
+	/* convert native php type to xmlrpc type */
+	xOut = PHP_to_XMLRPC(arg1);
 
-		/* generate raw xml from xmlrpc data */
-		outBuf = XMLRPC_VALUE_ToXML(xOut, 0);
+	/* generate raw xml from xmlrpc data */
+	outBuf = XMLRPC_VALUE_ToXML(xOut, 0);
 
-		if (xOut) {
-			if (outBuf) {
-				RETVAL_STRING(outBuf);
+	if (xOut) {
+		if (outBuf) {
+			RETVAL_STRING(outBuf);
 #ifdef HAVE_XMLRPC_BUNDLED
-				efree(outBuf);
+			efree(outBuf);
 #else
-				free(outBuf);
+			free(outBuf);
 #endif
-			}
-			/* cleanup */
-			XMLRPC_CleanupValue(xOut);
 		}
+		/* cleanup */
+		XMLRPC_CleanupValue(xOut);
 	}
 }
 /* }}} */
@@ -747,9 +743,7 @@ PHP_FUNCTION(xmlrpc_decode_request)
 		RETURN_THROWS();
 	}
 
-	if (USED_RET()) {
-		decode_request_worker(xml, xml_len, encoding_len ? encoding : NULL, method, return_value);
-	}
+	decode_request_worker(xml, xml_len, encoding_len ? encoding : NULL, method, return_value);
 }
 /* }}} */
 
@@ -764,9 +758,7 @@ PHP_FUNCTION(xmlrpc_decode)
 		RETURN_THROWS();
 	}
 
-	if (USED_RET()) {
-		decode_request_worker(arg1, arg1_len, arg2_len ? arg2 : NULL, NULL, return_value);
-	}
+	decode_request_worker(arg1, arg1_len, arg2_len ? arg2 : NULL, NULL, return_value);
 }
 /* }}} */
 
@@ -782,18 +774,16 @@ PHP_FUNCTION(xmlrpc_server_create)
 		RETURN_THROWS();
 	}
 
-	if (USED_RET()) {
-		xmlrpc_server_data *server;
+	xmlrpc_server_data *server;
 
-		object_init_ex(return_value, xmlrpc_server_ce);
-		server = Z_XMLRPC_SERVER_P(return_value);
+	object_init_ex(return_value, xmlrpc_server_ce);
+	server = Z_XMLRPC_SERVER_P(return_value);
 
-		array_init(&server->method_map);
-		array_init(&server->introspection_map);
-		server->server_ptr = XMLRPC_ServerCreate();
+	array_init(&server->method_map);
+	array_init(&server->introspection_map);
+	server->server_ptr = XMLRPC_ServerCreate();
 
-		XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback);
-	}
+	XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback);
 }
 /* }}} */
 
@@ -1103,24 +1093,22 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions)
 		RETURN_THROWS();
 	}
 
-	if (USED_RET()) {
-		STRUCT_XMLRPC_ERROR err = {0};
-		XMLRPC_VALUE xVal = XMLRPC_IntrospectionCreateDescription(arg1, &err);
-		if (xVal) {
-			XMLRPC_to_PHP(xVal, return_value);
-			/* dust, sweep, and mop */
-			XMLRPC_CleanupValue(xVal);
+	STRUCT_XMLRPC_ERROR err = {0};
+	XMLRPC_VALUE xVal = XMLRPC_IntrospectionCreateDescription(arg1, &err);
+	if (xVal) {
+		XMLRPC_to_PHP(xVal, return_value);
+		/* dust, sweep, and mop */
+		XMLRPC_CleanupValue(xVal);
+	} else {
+		/* could not create description */
+		if (err.xml_elem_error.parser_code) {
+			php_error_docref(NULL, E_WARNING, "XML parse error: [line %ld, column %ld, message: %s] Unable to create introspection data",
+					err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error);
 		} else {
-			/* could not create description */
-			if (err.xml_elem_error.parser_code) {
-				php_error_docref(NULL, E_WARNING, "XML parse error: [line %ld, column %ld, message: %s] Unable to create introspection data",
-						err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error);
-			} else {
-				php_error_docref(NULL, E_WARNING, "Invalid xml structure. Unable to create introspection data");
-			}
-
-			php_error_docref(NULL, E_WARNING, "XML parse error. no method description created");
+			php_error_docref(NULL, E_WARNING, "Invalid xml structure. Unable to create introspection data");
 		}
+
+		php_error_docref(NULL, E_WARNING, "XML parse error. no method description created");
 	}
 }
 /* }}} */