[PHP-CVS] cvs: php-src /ext/recode recode.c

[Derick Rethans]

derick          Mon Jul  7 09:21:10 2003 EDT

  Modified files:              
    /php-src/ext/recode recode.c 
  Log:
  - Commiting conversion to zend_parse_parameters (leftovers from debugging).
  
  
Index: php-src/ext/recode/recode.c
diff -u php-src/ext/recode/recode.c:1.32 php-src/ext/recode/recode.c:1.33
--- php-src/ext/recode/recode.c:1.32    Tue Jun 10 16:03:35 2003
+++ php-src/ext/recode/recode.c Mon Jul  7 09:21:10 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: recode.c,v 1.32 2003/06/10 20:03:35 imajes Exp $ */
+/* $Id: recode.c,v 1.33 2003/07/07 13:21:10 derick Exp $ */
 
 /* {{{ includes & prototypes */
 
@@ -119,7 +119,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_row(2, "Recode Support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.32 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.33 $");
        php_info_print_table_end();
 }
 
@@ -129,16 +129,14 @@
 {
        RECODE_REQUEST request = NULL;
        char *r = NULL;
-       zval **str;
-       zval **req;
        bool success;
-       int r_len=0, r_alen =0;
+       int r_len = 0, r_alen = 0;
+       int req_len, str_len;
+       char *req, *str;
 
-       if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &req, &str) == FAILURE) {
-               WRONG_PARAM_COUNT;
+       if (zend_parse_parameters(TSRMLS_CC ZEND_NUM_ARGS(), "ss", &req, &req_len, 
&str, &str_len) == FAILURE) {
+               return;
        }
-       convert_to_string_ex(str);
-       convert_to_string_ex(req);
 
        request = recode_new_request(ReSG(outer));
 
@@ -147,13 +145,13 @@
                RETURN_FALSE;
        }
        
-       success = recode_scan_request(request, Z_STRVAL_PP(req));
+       success = recode_scan_request(request, req);
        if (!success) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode request 
'%s'", Z_STRVAL_PP(req));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode request 
'%s'", req);
                goto error_exit;
        }
        
-       recode_buffer_to_buffer(request, Z_STRVAL_PP(str), Z_STRLEN_PP(str), &r, 
&r_len, &r_alen);
+       recode_buffer_to_buffer(request, str, str_len, &r, &r_len, &r_alen);
        if (!r) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed.");
                goto error_exit;



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