php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify and cleanup code.

Browse Source
This commit is contained in:
Ilia Alshanetsky
2004-11-12 02:22:01 +00:00
parent 68faef668b
commit 613db6ee30
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/recode/recode.c
+12 -25
View File
@@ -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;
}
/* }}} */