diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-15 22:54:29 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-15 22:54:29 +0000 |
| commit | ed5383b811f512fb41680b45fbb57c88aa6bbde5 (patch) | |
| tree | 05b8d960c76a607e9fb40643c205a228af82f7bc /ext/sysvsem | |
| parent | 1518ba3bf7d842a70d2f21b8bce054e38ba7ac44 (diff) | |
| download | php-git-ed5383b811f512fb41680b45fbb57c88aa6bbde5.tar.gz | |
MFB51: Cleanup code and prevent usage of uninitialized variable.
Diffstat (limited to 'ext/sysvsem')
| -rw-r--r-- | ext/sysvsem/sysvsem.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index a0b4ef2ca7..859f55e4c8 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -169,17 +169,11 @@ PHP_MINIT_FUNCTION(sysvsem) 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 @@ PHP_FUNCTION(sem_get) } /* 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)); } |