felipe                                   Tue, 15 Nov 2011 12:34:59 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=319245

Log:
- We can constify in 5.4+

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c
    U   php/php-src/trunk/ext/dba/dba_db4.c

Modified: php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c      2011-11-15 12:18:45 UTC 
(rev 319244)
+++ php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c      2011-11-15 12:34:59 UTC 
(rev 319245)
@@ -48,7 +48,7 @@
 /* Bug 51086, Berkeley DB 4.8.26 */
 /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test 
compatibility */
        {
-               char *function = get_active_function_name(TSRMLS_C);
+               const char *function = get_active_function_name(TSRMLS_C);
                if (function && (!strcmp(function,"dba_popen") || 
!strcmp(function,"dba_open"))
                        && (!strncmp(msg, "fop_read_meta", 
sizeof("fop_read_meta")-1)
                                || !strncmp(msg, "BDB0004 fop_read_meta", 
sizeof("BDB0004 fop_read_meta")-1))) {

Modified: php/php-src/trunk/ext/dba/dba_db4.c
===================================================================
--- php/php-src/trunk/ext/dba/dba_db4.c 2011-11-15 12:18:45 UTC (rev 319244)
+++ php/php-src/trunk/ext/dba/dba_db4.c 2011-11-15 12:34:59 UTC (rev 319245)
@@ -48,7 +48,7 @@
 /* Bug 51086, Berkeley DB 4.8.26 */
 /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test 
compatibility */
        {
-               char *function = get_active_function_name(TSRMLS_C);
+               const char *function = get_active_function_name(TSRMLS_C);
                if (function && (!strcmp(function,"dba_popen") || 
!strcmp(function,"dba_open"))
                        && (!strncmp(msg, "fop_read_meta", 
sizeof("fop_read_meta")-1)
                                || !strncmp(msg, "BDB0004 fop_read_meta", 
sizeof("BDB0004 fop_read_meta")-1))) {

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

Reply via email to