]> granicus.if.org Git - php/commitdiff
MFB: make C++ compilers happy
authorIlia Alshanetsky <iliaa@php.net>
Thu, 27 Jul 2006 14:13:53 +0000 (14:13 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Thu, 27 Jul 2006 14:13:53 +0000 (14:13 +0000)
ext/session/session.c

index 5f3c5b07f2aade06bf874b3fb5b4e6c7e45ef865..4b60fb22476957b4a60b355c65c9ec7f1861e0b9 100644 (file)
@@ -653,7 +653,7 @@ static void php_session_initialize(TSRMLS_D)
 {
        char *val;
        int vallen;
-       zend_bool new = 0;
+       zend_bool make_new = 0;
 
        /* check session name for invalid characters */
        if (PS(id) && strpbrk(PS(id), "\r\n\t <>'\"\\")) {
@@ -679,7 +679,7 @@ new_session:
                if (PS(use_cookies)) {
                        PS(send_cookie) = 1;
                }
-               new = 1;
+               make_new = 1;
        }
        
        /* Read data */
@@ -692,7 +692,7 @@ new_session:
        if (PS(mod)->s_read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == SUCCESS) {
                php_session_decode(val, vallen TSRMLS_CC);
                efree(val);
-       } else if (!new) {
+       } else if (!make_new) {
                goto new_session;
        }
 }