]> granicus.if.org Git - php/commitdiff
recode update for phpng
authorkrakjoe <joe.watkins@live.co.uk>
Thu, 8 May 2014 10:57:35 +0000 (11:57 +0100)
committerkrakjoe <joe.watkins@live.co.uk>
Thu, 8 May 2014 10:57:35 +0000 (11:57 +0100)
ext/recode/recode.c

index 3fff0a7f7f38d14822c458730319d132d602a061..07f0332af682c82c1208ca3fc7d51fe044aedf47 100644 (file)
@@ -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;