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

[Ilia Alshanetsky]

iliaa           Thu Nov 11 21:22:05 2004 EDT

  Modified files:              
    /php-src/ext/recode recode.c 
  Log:
  Simplify and cleanup code.
  
  
http://cvs.php.net/diff.php/php-src/ext/recode/recode.c?r1=1.35&r2=1.36&ty=u
Index: php-src/ext/recode/recode.c
diff -u php-src/ext/recode/recode.c:1.35 php-src/ext/recode/recode.c:1.36
--- php-src/ext/recode/recode.c:1.35    Thu Jan  8 03:17:22 2004
+++ php-src/ext/recode/recode.c Thu Nov 11 21:22:01 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: recode.c,v 1.35 2004/01/08 08:17:22 andi Exp $ */
+/* $Id: recode.c,v 1.36 2004/11/12 02:22:01 iliaa 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.35 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.36 $");
        php_info_print_table_end();
 }
 
@@ -129,7 +129,6 @@
 {
        RECODE_REQUEST request = NULL;
        char *r = NULL;
-       bool success;
        int r_len = 0, r_alen = 0;
        int req_len, str_len;
        char *req, *str;
@@ -144,9 +143,8 @@
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot allocate 
request structure");
                RETURN_FALSE;
        }
-       
-       success = recode_scan_request(request, req);
-       if (!success) {
+
+       if (!recode_scan_request(request, req)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode 
request '%s'", req);
                goto error_exit;
        }
@@ -154,19 +152,14 @@
        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;
-       }
-       
-       RETVAL_STRINGL(r, r_len, 1);
-       free(r);
-       /* FALLTHROUGH */
-
 error_exit:
-       if (request)
-               recode_delete_request(request);
+               RETVAL_FALSE;
+       } else {
+               RETVAL_STRINGL(r, r_len, 1);
+               free(r);
+       }
 
-       if (!r) 
-               RETURN_FALSE;
+       recode_delete_request(request);
 
        return;
 }
@@ -177,7 +170,6 @@
 PHP_FUNCTION(recode_file)
 {
        RECODE_REQUEST request = NULL;
-       int success;
        zval **req;
        zval **input, **output;
        php_stream *instream, *outstream;
@@ -206,26 +198,21 @@
                RETURN_FALSE;
        }
 
-       success = recode_scan_request(request, Z_STRVAL_PP(req));
-       if (!success) {
+       if (!recode_scan_request(request, Z_STRVAL_PP(req))) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode 
request '%s'", Z_STRVAL_PP(req));
                goto error_exit;
        }
        
-       success = recode_file_to_file(request, in_fp, out_fp);
-       if (!success) {
+       if (!recode_file_to_file(request, in_fp, out_fp)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed.");
                goto error_exit;
        }
 
-       if (request)
-               recode_delete_request(request);
+       recode_delete_request(request);
        RETURN_TRUE;
 
 error_exit:
-       if (request)
-               recode_delete_request(request);
-       
+       recode_delete_request(request);
        RETURN_FALSE;
 }
 /* }}} */

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