diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-11-12 02:22:01 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-11-12 02:22:01 +0000 |
| commit | 613db6ee30b2375b08b2fea5fcf10c2ee8c1eb8a (patch) | |
| tree | d03290ad805ebccc74142c3badc2af5617ed2445 /ext/recode/recode.c | |
| parent | 68faef668bfba30b91e16cdbdb941009e26618c8 (diff) | |
| download | php-git-613db6ee30b2375b08b2fea5fcf10c2ee8c1eb8a.tar.gz | |
Simplify and cleanup code.
Diffstat (limited to 'ext/recode/recode.c')
| -rw-r--r-- | ext/recode/recode.c | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/ext/recode/recode.c b/ext/recode/recode.c index b852e30b52..9d4a8258df 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -129,7 +129,6 @@ PHP_FUNCTION(recode_string) { 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_FUNCTION(recode_string) 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 @@ PHP_FUNCTION(recode_string) 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 @@ error_exit: PHP_FUNCTION(recode_file) { RECODE_REQUEST request = NULL; - int success; zval **req; zval **input, **output; php_stream *instream, *outstream; @@ -206,26 +198,21 @@ PHP_FUNCTION(recode_file) 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; } /* }}} */ |