iliaa Thu Dec 15 22:54:29 2005 EDT
Modified files:
/php-src/ext/sysvsem sysvsem.c
Log:
MFB51: Cleanup code and prevent usage of uninitialized variable.
http://cvs.php.net/viewcvs.cgi/php-src/ext/sysvsem/sysvsem.c?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/sysvsem/sysvsem.c
diff -u php-src/ext/sysvsem/sysvsem.c:1.52 php-src/ext/sysvsem/sysvsem.c:1.53
--- php-src/ext/sysvsem/sysvsem.c:1.52 Tue Dec 6 02:24:50 2005
+++ php-src/ext/sysvsem/sysvsem.c Thu Dec 15 22:54:29 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvsem.c,v 1.52 2005/12/06 02:24:50 sniper Exp $ */
+/* $Id: sysvsem.c,v 1.53 2005/12/15 22:54:29 iliaa Exp $ */
/* Latest update build anc tested on Linux 2.2.14
*
@@ -169,17 +169,11 @@
Return an id for the semaphore with the given key, and allow max_acquire
(default 1) processes to acquire it simultaneously */
PHP_FUNCTION(sem_get)
{
- long key, max_acquire, perm, auto_release = 1;
+ long key, max_acquire = 1, perm = 0666, auto_release = 1;
int semid;
struct sembuf sop[3];
int count;
sysvsem_sem *sem_ptr;
-#if HAVE_SEMUN
- union semun un;
-#endif
-
- max_acquire = 1;
- perm = 0666;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"l|lll", &key, &max_acquire, &perm, &auto_release)) {
RETURN_FALSE;
@@ -231,11 +225,7 @@
}
/* Get the usage count. */
-#if HAVE_SEMUN
- count = semctl(semid, SYSVSEM_USAGE, GETVAL, un);
-#else
count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL);
-#endif
if (count == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key
0x%lx: %s", key, strerror(errno));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
