Browse Source

* Use proper Zend macro RETURN_STRINGL in caca_file_read, caca_files_gets,

caca_export_string
tags/v0.99.beta17
Nicolas Vion nico 16 years ago
parent
commit
5d98ca2e08
1 changed files with 3 additions and 9 deletions
  1. +3
    -9
      caca-php/php_caca.c

+ 3
- 9
caca-php/php_caca.c View File

@@ -1538,9 +1538,7 @@ PHP_FUNCTION(caca_file_read) {
} }
caca_file_read(file, buffer, len); caca_file_read(file, buffer, len);


return_value->type = IS_STRING;
return_value->value.str.len = len;
return_value->value.str.val = buffer;
RETURN_STRINGL(buffer, len, 1);
} }


PHP_FUNCTION(caca_file_write) { PHP_FUNCTION(caca_file_write) {
@@ -1575,9 +1573,7 @@ PHP_FUNCTION(caca_file_gets) {
if (!result) { if (!result) {
RETURN_FALSE; RETURN_FALSE;
} }
return_value->type = IS_STRING;
return_value->value.str.len = len;
return_value->value.str.val = result;
RETURN_STRINGL(result, len, 1);
} }


PHP_FUNCTION(caca_file_eof) { PHP_FUNCTION(caca_file_eof) {
@@ -1647,9 +1643,7 @@ PHP_FUNCTION(caca_export_string) {
memcpy(copy, buffer, len); memcpy(copy, buffer, len);
free(buffer); free(buffer);


return_value->type = IS_STRING;
return_value->value.str.len = len;
return_value->value.str.val = copy;
RETURN_STRINGL((char*) copy, len, 0);
} }


PHP_FUNCTION(caca_get_export_list) { PHP_FUNCTION(caca_get_export_list) {


Loading…
Cancel
Save