use RETURN_* instead of RETVAL_* and fix #40083

diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index 4ac39701b832933c3887e026f6a7e502df99f977..61e0cba48e6cc50ab791dc3044b97b4f8466a5e5 100644 (file)
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -581,11 +581,11 @@ PHP_FUNCTION(smfi_getsymval)
                php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &symname, &len) == SUCCESS) {
                if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
-                       RETVAL_STRING(ret, 1);
+                       RETURN_STRING(ret, 1);
                }
        }
 
-       RETVAL_NULL();
+       RETURN_NULL();
 }
 /* }}} */
 
@@ -602,11 +602,11 @@ PHP_FUNCTION(smfi_setreply)
                php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(3 TSRMLS_CC, "sss", &rcode, &len, &xcode, &len, &message, &len) == SUCCESS) {
                if (smfi_setreply(MG(ctx), rcode, xcode, message) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */
 
@@ -622,11 +622,11 @@ PHP_FUNCTION(smfi_addheader)
                php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(2 TSRMLS_CC, "ss", &f, &len, &v, &len) == SUCCESS) {
                if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */
 
@@ -643,11 +643,11 @@ PHP_FUNCTION(smfi_chgheader)
                php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(3 TSRMLS_CC, "sls", &f, &len, &idx, &v, &len) == SUCCESS) {
                if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */
 
@@ -663,11 +663,11 @@ PHP_FUNCTION(smfi_addrcpt)
                php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
                if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */
 
@@ -683,11 +683,11 @@ PHP_FUNCTION(smfi_delrcpt)
                php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
                if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */
 
@@ -704,11 +704,11 @@ PHP_FUNCTION(smfi_replacebody)
                php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
        } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &body, &len) == SUCCESS) {
                if (smfi_replacebody(MG(ctx), body, len) == MI_SUCCESS) {
-                       RETVAL_TRUE;
+                       RETURN_TRUE;
                }
        }
        
-       RETVAL_FALSE;
+       RETURN_FALSE;
 }
 /* }}} */