Skip to content

Commit 3f35096

Browse files
committed
use RETURN_* instead of RETVAL_* and fix #40083
1 parent ae792a0 commit 3f35096

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

sapi/milter/php_milter.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,11 @@ PHP_FUNCTION(smfi_getsymval)
581581
php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
582582
} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &symname, &len) == SUCCESS) {
583583
if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
584-
RETVAL_STRING(ret, 1);
584+
RETURN_STRING(ret, 1);
585585
}
586586
}
587587

588-
RETVAL_NULL();
588+
RETURN_NULL();
589589
}
590590
/* }}} */
591591

@@ -602,11 +602,11 @@ PHP_FUNCTION(smfi_setreply)
602602
php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
603603
} else if (zend_parse_parameters(3 TSRMLS_CC, "sss", &rcode, &len, &xcode, &len, &message, &len) == SUCCESS) {
604604
if (smfi_setreply(MG(ctx), rcode, xcode, message) == MI_SUCCESS) {
605-
RETVAL_TRUE;
605+
RETURN_TRUE;
606606
}
607607
}
608608

609-
RETVAL_FALSE;
609+
RETURN_FALSE;
610610
}
611611
/* }}} */
612612

@@ -622,11 +622,11 @@ PHP_FUNCTION(smfi_addheader)
622622
php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
623623
} else if (zend_parse_parameters(2 TSRMLS_CC, "ss", &f, &len, &v, &len) == SUCCESS) {
624624
if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
625-
RETVAL_TRUE;
625+
RETURN_TRUE;
626626
}
627627
}
628628

629-
RETVAL_FALSE;
629+
RETURN_FALSE;
630630
}
631631
/* }}} */
632632

@@ -643,11 +643,11 @@ PHP_FUNCTION(smfi_chgheader)
643643
php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
644644
} else if (zend_parse_parameters(3 TSRMLS_CC, "sls", &f, &len, &idx, &v, &len) == SUCCESS) {
645645
if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
646-
RETVAL_TRUE;
646+
RETURN_TRUE;
647647
}
648648
}
649649

650-
RETVAL_FALSE;
650+
RETURN_FALSE;
651651
}
652652
/* }}} */
653653

@@ -663,11 +663,11 @@ PHP_FUNCTION(smfi_addrcpt)
663663
php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
664664
} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
665665
if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
666-
RETVAL_TRUE;
666+
RETURN_TRUE;
667667
}
668668
}
669669

670-
RETVAL_FALSE;
670+
RETURN_FALSE;
671671
}
672672
/* }}} */
673673

@@ -683,11 +683,11 @@ PHP_FUNCTION(smfi_delrcpt)
683683
php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
684684
} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
685685
if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
686-
RETVAL_TRUE;
686+
RETURN_TRUE;
687687
}
688688
}
689689

690-
RETVAL_FALSE;
690+
RETURN_FALSE;
691691
}
692692
/* }}} */
693693

@@ -704,11 +704,11 @@ PHP_FUNCTION(smfi_replacebody)
704704
php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
705705
} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &body, &len) == SUCCESS) {
706706
if (smfi_replacebody(MG(ctx), body, len) == MI_SUCCESS) {
707-
RETVAL_TRUE;
707+
RETURN_TRUE;
708708
}
709709
}
710710

711-
RETVAL_FALSE;
711+
RETURN_FALSE;
712712
}
713713
/* }}} */
714714

0 commit comments

Comments
 (0)