Changeset 3334 for libcaca/trunk/caca-php/php_caca.cTweet

Timestamp:

Dec 9, 2008, 6:37:22 PM (14 years ago)

Author:

nico

Message:

• Remove 'copy' attribute of RETURN_STRINGL in php binding of functions: caca_file_gets, caca_file_read
• Use RETVAL_STRINGL instead of RETURN_STRINGL in function caca_export_string

File:

• libcaca/trunk/caca-php/php_caca.c (modified) (2 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -1551 +1551 @@
         caca_file_read(file, buffer, len);
 
-        RETURN_STRINGL(buffer, len, 1);
+        RETURN_STRINGL(buffer, len, 1cac);
 }
 
@@ -1646 +1646 @@
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
 
-        void *buffer, *copy;
+        void *buffer;
         size_t len = 0;
         buffer = caca_export_memory(canvas, type, &len);
-        copy = emalloc(len);
-        if (!buffer || !copy) {
-                RETURN_FALSE;
-        }
-        memcpy(copy, buffer, len);
+        if (!buffer) {
+                RETURN_FALSE;
+        }
+
+        RETVAL_STRINGL((char*) buffer, len, 1);
         free(buffer);
-
-        RETURN_STRINGL((char*) copy, len, 0);
 }