Changeset 3260Tweet

Timestamp:

Nov 4, 2008, 1:39:40 AM (12 years ago)

Author:

bsittler

Message:

fix typo in PHP binding of caca_set_Attr that caused segfault on linux; also remove workaround for spurious extra-argument requirement from two of the PHP examples

Location:

libcaca/trunk/caca-php

Files:

• examples/colors.php (modified) (1 diff)
• examples/export.php (modified) (1 diff)
• php_caca.c (modified) (1 diff)

libcaca/trunk/caca-php/examples/colors.php

@@ -46 +46 @@
 caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
 caca_put_str($cv, 3, 20, "This is bold    This is blink    This is italics    This is underline");
-caca_set_attr($cv, CACA_BOLD, CACA_DEFAULT);
+caca_set_attr($cv, CACA_BOLD);
 caca_put_str($cv, 3 + 8, 20, "bold");
-caca_set_attr($cv, CACA_BLINK, CACA_DEFAULT);
+caca_set_attr($cv, CACA_BLINK);
 caca_put_str($cv, 3 + 24, 20, "blink");
-caca_set_attr($cv, CACA_ITALICS, CACA_DEFAULT);
+caca_set_attr($cv, CACA_ITALICS);
 caca_put_str($cv, 3 + 41, 20, "italics");
-caca_set_attr($cv, CACA_UNDERLINE, CACA_DEFAULT);
+caca_set_attr($cv, CACA_UNDERLINE);
 caca_put_str($cv, 3 + 60, 20, "underline");
 

libcaca/trunk/caca-php/examples/export.php

@@ -112 +112 @@
         caca_put_str($cv, WIDTH / 2 - 5, HEIGHT / 2 + 4, "(\") \\o/ <&>");
 
-        caca_set_attr($cv, CACA_BOLD, CACA_DEFAULT);
+        caca_set_attr($cv, CACA_BOLD);
         caca_put_str($cv, WIDTH / 2 - 16, HEIGHT / 2 + 3, "Bold");
-        caca_set_attr($cv, CACA_BLINK, CACA_DEFAULT);
+        caca_set_attr($cv, CACA_BLINK);
         caca_put_str($cv, WIDTH / 2 - 9, HEIGHT / 2 + 3, "Blink");
-        caca_set_attr($cv, CACA_ITALICS, CACA_DEFAULT);
+        caca_set_attr($cv, CACA_ITALICS);
         caca_put_str($cv, WIDTH / 2 - 1, HEIGHT / 2 + 3, "Italics");
-        caca_set_attr($cv, CACA_UNDERLINE, CACA_DEFAULT);
+        caca_set_attr($cv, CACA_UNDERLINE);
         caca_put_str($cv, WIDTH / 2 + 8, HEIGHT / 2 + 3, "Underline");
-        caca_set_attr($cv, 0, CACA_DEFAULT);
+        caca_set_attr($cv, 0);
 
         caca_set_color_ansi($cv, CACA_WHITE, CACA_LIGHTBLUE);

libcaca/trunk/caca-php/php_caca.c

@@ -645 +645 @@
         zval *_zval;
         long attr = 0;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &attr) == FAILURE) {
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &attr) == FAILURE) {
                 RETURN_FALSE;
         }