[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/milter php_milter.c

[Antony Dovgal]

tony2001                Wed Jan 10 12:03:11 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/milter        php_milter.c 
  Log:
  use RETURN_* instead of RETVAL_* and fix #40083
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.1&r2=1.14.2.2.2.2&diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.1 
php-src/sapi/milter/php_milter.c:1.14.2.2.2.2
--- php-src/sapi/milter/php_milter.c:1.14.2.2.2.1       Mon Jan  1 09:36:13 2007
+++ php-src/sapi/milter/php_milter.c    Wed Jan 10 12:03:11 2007
@@ -581,11 +581,11 @@
                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_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_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_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_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_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_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;
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php