com php-src: recode update for phpng: ext/recode/recode.c
| From: | Joe Watkins | Date: | Thu, 08 May 2014 10:57:35 +0000 |
| Subject: | com php-src: recode update for phpng: ext/recode/recode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78210@lists.php.net to get a copy of this message | ||
Commit: f9cfbb8ea1e79d0653029a0b6294e7352acb80f4
Author: krakjoe <joe.watkins@live.co.uk> Thu, 8 May 2014 11:57:35 +0100
Parents: 1f9ecf42b6e9f89b28318bb01de034f9c3aaef38
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9cfbb8ea1e79d0653029a0b6294e7352acb80f4
Log:
recode update for phpng
Changed paths:
M ext/recode/recode.c
Diff:
diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 3fff0a7..07f0332 100644
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -171,7 +171,7 @@ PHP_FUNCTION(recode_string)
error_exit:
RETVAL_FALSE;
} else {
- RETVAL_STRINGL(r, r_len, 1);
+ RETVAL_STRINGL(r, r_len);
free(r);
}
@@ -196,8 +196,8 @@ PHP_FUNCTION(recode_file)
return;
}
- php_stream_from_zval(instream, &input);
- php_stream_from_zval(outstream, &output);
+ php_stream_from_zval(instream, input);
+ php_stream_from_zval(outstream, output);
if (FAILURE == php_stream_cast(instream, PHP_STREAM_AS_STDIO, (void**)&in_fp,
REPORT_ERRORS)) {
RETURN_FALSE;