[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/posix/posix.c branches/PHP_5_3/ext/posix/posix.c trunk/ext/posix/posix.c

[Jani Taskinen]

jani                                     Thu, 06 Aug 2009 11:11:15 +0000

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

Log:
- Fix CS and remove extra strlen() call

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/posix/posix.c
    U   php/php-src/branches/PHP_5_3/ext/posix/posix.c
    U   php/php-src/trunk/ext/posix/posix.c

Modified: php/php-src/branches/PHP_5_2/ext/posix/posix.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/posix.c      2009-08-06 11:05:07 UTC 
(rev 286879)
+++ php/php-src/branches/PHP_5_2/ext/posix/posix.c      2009-08-06 11:11:15 UTC 
(rev 286880)
@@ -1196,7 +1196,9 @@
                RETURN_FALSE;
        }

-       if(strlen(name)==0) RETURN_FALSE;
+       if (name_len == 0) {
+               RETURN_FALSE;
+       }

        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }

Modified: php/php-src/branches/PHP_5_3/ext/posix/posix.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/posix.c      2009-08-06 11:05:07 UTC 
(rev 286879)
+++ php/php-src/branches/PHP_5_3/ext/posix/posix.c      2009-08-06 11:11:15 UTC 
(rev 286880)
@@ -1361,7 +1361,9 @@
                RETURN_FALSE;
        }

-       if(strlen(name)==0) RETURN_FALSE;
+       if (name_len == 0) {
+               RETURN_FALSE;
+       }

        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }

Modified: php/php-src/trunk/ext/posix/posix.c
===================================================================
--- php/php-src/trunk/ext/posix/posix.c 2009-08-06 11:05:07 UTC (rev 286879)
+++ php/php-src/trunk/ext/posix/posix.c 2009-08-06 11:11:15 UTC (rev 286880)
@@ -1390,7 +1390,9 @@
                RETURN_FALSE;
        }

-       if(strlen(name)==0) RETURN_FALSE;
+       if (name_len == 0) {
+               RETURN_FALSE;
+       }

        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }


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