Re: cvs: php-src /ext/ncurses ncurses_functions.c /sapi/cli php_cli.c ZendEngine2 zend.h zend_constants.c

How/when did that happen? Andi At 02:02 AM 1/20/2005 +0000, Jani Taskinen wrote:

sniper          Wed Jan 19 21:02:09 2005 EDT

Modified files:

    /ZendEngine2        zend.h zend_constants.c
    /php-src/ext/ncurses        ncurses_functions.c
    /php-src/sapi/cli   php_cli.c

Log: - Revert the weird change of ZEND_STRS() macro and use the correct

    ZEND_STRL() macro.

# ZEND_STRS was changed to be same as ZEND_STRL..someone on crack? :) http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.268&r2=1.269&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.268 ZendEngine2/zend.h:1.269

--- ZendEngine2/zend.h:1.268    Mon Jan 10 16:57:30 2005

+++ ZendEngine2/zend.h Wed Jan 19 21:02:08 2005 @@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: zend.h,v 1.268 2005/01/10 21:57:30 rasmus Exp $ */ +/* $Id: zend.h,v 1.269 2005/01/20 02:02:08 sniper Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -377,7 +377,7 @@ #define MAX(a, b) (((a)>(b))?(a):(b)) #define MIN(a, b) (((a)<(b))?(a):(b))

 #define ZEND_STRL(str)         (str), (sizeof(str)-1)
-#define ZEND_STRS(str)         (str), (sizeof(str)-1)
+#define ZEND_STRS(str)         (str), (sizeof(str))
 #define ZEND_NORMALIZE_BOOL(n)                 \
        ((n) ? (((n)>0) ? 1 : -1) : 0)
 #define ZEND_TRUTH(x)          ((x) ? 1 : 0)

http://cvs.php.net/diff.php/ZendEngine2/zend_constants.c?r1=1.69&r2=1.70&ty=u Index: ZendEngine2/zend_constants.c diff -u ZendEngine2/zend_constants.c:1.69 ZendEngine2/zend_constants.c:1.70 --- ZendEngine2/zend_constants.c:1.69 Tue Jul 13 15:22:11 2004

+++ ZendEngine2/zend_constants.c        Wed Jan 19 21:02:08 2005

@@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: zend_constants.c,v 1.69 2004/07/13 19:22:11 helly Exp $ */ +/* $Id: zend_constants.c,v 1.70 2005/01/20 02:02:08 sniper Exp $ */ #include "zend.h" #include "zend_constants.h" @@ -116,25 +116,25 @@

                c.flags = CONST_PERSISTENT;
                c.module_number = 0;

-               c.name = zend_strndup(ZEND_STRS("TRUE"));
+               c.name = zend_strndup(ZEND_STRL("TRUE"));
                c.name_len = sizeof("TRUE");
                c.value.value.lval = 1;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);

-               c.name = zend_strndup(ZEND_STRS("FALSE"));
+               c.name = zend_strndup(ZEND_STRL("FALSE"));
                c.name_len = sizeof("FALSE");
                c.value.value.lval = 0;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);

-               c.name = zend_strndup(ZEND_STRS("ZEND_THREAD_SAFE"));
+               c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE"));
                c.name_len = sizeof("ZEND_THREAD_SAFE");
                c.value.value.lval = ZTS_V;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);

-               c.name = zend_strndup(ZEND_STRS("NULL"));
+               c.name = zend_strndup(ZEND_STRL("NULL"));
                c.name_len = sizeof("NULL");
                c.value.type = IS_NULL;
                zend_register_constant(&c TSRMLS_CC);

http://cvs.php.net/diff.php/php-src/ext/ncurses/ncurses_functions.c?r1=1.45&r2=1.46&ty=u Index: php-src/ext/ncurses/ncurses_functions.c diff -u php-src/ext/ncurses/ncurses_functions.c:1.45 php-src/ext/ncurses/ncurses_functions.c:1.46

--- php-src/ext/ncurses/ncurses_functions.c:1.45        Thu Jan  8 03:16:27 2004
+++ php-src/ext/ncurses/ncurses_functions.c     Wed Jan 19 21:02:09 2005

@@ -149,7 +149,7 @@

                c.value = *zscr;
                zval_copy_ctor(&c.value);
                c.flags = CONST_CS;
-               c.name = zend_strndup(ZEND_STRS("STDSCR"));
+               c.name = zend_strndup(ZEND_STRL("STDSCR"));
                c.name_len = sizeof("STDSCR");
                zend_register_constant(&c TSRMLS_CC);

@@ -162,7 +162,7 @@

                c.value = *zscr;            \
                zval_copy_ctor(&c.value);   \
                c.flags = CONST_CS;         \
-               c.name = zend_strndup(ZEND_STRS("NCURSES_" #x)); \
+               c.name = zend_strndup(ZEND_STRL("NCURSES_" #x)); \
                c.name_len = sizeof("NCURSES_" #x);                           \
                zend_register_constant(&c TSRMLS_CC)

http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.115&r2=1.116&ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.115 php-src/sapi/cli/php_cli.c:1.116

--- php-src/sapi/cli/php_cli.c:1.115    Mon Dec 20 14:33:38 2004

+++ php-src/sapi/cli/php_cli.c Wed Jan 19 21:02:09 2005 @@ -19,7 +19,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: php_cli.c,v 1.115 2004/12/20 19:33:38 rasmus Exp $ */ +/* $Id: php_cli.c,v 1.116 2005/01/20 02:02:09 sniper Exp $ */ #include "php.h" #include "php_globals.h" @@ -455,21 +455,21 @@

        ic.value = *zin;
        ic.flags = CONST_CS;
-       ic.name = zend_strndup(ZEND_STRS("STDIN"));
+       ic.name = zend_strndup(ZEND_STRL("STDIN"));
        ic.name_len = sizeof("STDIN");
        ic.module_number = 0;
        zend_register_constant(&ic TSRMLS_CC);

        oc.value = *zout;
        oc.flags = CONST_CS;
-       oc.name = zend_strndup(ZEND_STRS("STDOUT"));
+       oc.name = zend_strndup(ZEND_STRL("STDOUT"));
        oc.name_len = sizeof("STDOUT");
        oc.module_number = 0;
        zend_register_constant(&oc TSRMLS_CC);

        ec.value = *zerr;
        ec.flags = CONST_CS;
-       ec.name = zend_strndup(ZEND_STRS("STDERR"));
+       ec.name = zend_strndup(ZEND_STRL("STDERR"));
        ec.name_len = sizeof("STDERR");
        ec.module_number = 0;
        zend_register_constant(&ec TSRMLS_CC);

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php