diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-03 23:10:02 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-03 23:10:02 +0000 |
| commit | 1e3940d547237007c0cd201d236ed397e1417a8a (patch) | |
| tree | c2f0f1609083da46092ae48ac9d36f529c9288fe /cpukit | |
| parent | Use versioned gpg keys to work around Fedora 11's rpms having broken backward... (diff) | |
| download | rtems-1e3940d547237007c0cd201d236ed397e1417a8a.tar.bz2 | |
2009-05-03 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/condtimedwait.c, posix/src/mutextimedlock.c,
posix/src/prwlocktimedrdlock.c, posix/src/prwlocktimedwrlock.c,
posix/src/semopen.c: Silence warnings.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/posix/src/condtimedwait.c | 1 | ||||
| -rw-r--r-- | cpukit/posix/src/mutextimedlock.c | 8 | ||||
| -rw-r--r-- | cpukit/posix/src/prwlocktimedrdlock.c | 1 | ||||
| -rw-r--r-- | cpukit/posix/src/prwlocktimedwrlock.c | 1 | ||||
| -rw-r--r-- | cpukit/posix/src/semopen.c | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index eaa3eae678..36f17b9b64 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2009-05-03 Joel Sherrill <joel.sherrill@oarcorp.com> + + * posix/src/condtimedwait.c, posix/src/mutextimedlock.c, + posix/src/prwlocktimedrdlock.c, posix/src/prwlocktimedwrlock.c, + posix/src/semopen.c: Silence warnings. + 2009-04-29 Sebastian Huber <sebastian.huber@embedded-brains.de> * sapi/include/confdefs.h, libblock/include/rtems/bdbuf.h: Changed diff --git a/cpukit/posix/src/condtimedwait.c b/cpukit/posix/src/condtimedwait.c index 5f085a04c8..aa48131ecd 100644 --- a/cpukit/posix/src/condtimedwait.c +++ b/cpukit/posix/src/condtimedwait.c @@ -59,6 +59,7 @@ int pthread_cond_timedwait( already_timedout = true; break; case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: + default: /* only to silence warnings */ already_timedout = false; break; } diff --git a/cpukit/posix/src/mutextimedlock.c b/cpukit/posix/src/mutextimedlock.c index 0e3e46f37d..7253502a1f 100644 --- a/cpukit/posix/src/mutextimedlock.c +++ b/cpukit/posix/src/mutextimedlock.c @@ -64,16 +64,12 @@ int pthread_mutex_timedlock( do_wait = false; break; case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: + default: /* only to silence warnings */ do_wait = true; break; } - lock_status = _POSIX_Mutex_Lock_support( - mutex, - do_wait, - ticks - ); - + lock_status = _POSIX_Mutex_Lock_support( mutex, do_wait, ticks ); /* * This service only gives us the option to block. We used a polling * attempt to lock if the abstime was not in the future. If we did diff --git a/cpukit/posix/src/prwlocktimedrdlock.c b/cpukit/posix/src/prwlocktimedrdlock.c index 020bec6ac9..dfd2124bfa 100644 --- a/cpukit/posix/src/prwlocktimedrdlock.c +++ b/cpukit/posix/src/prwlocktimedrdlock.c @@ -66,6 +66,7 @@ int pthread_rwlock_timedrdlock( do_wait = false; break; case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: + default: /* only to silence warnings */ do_wait = true; break; } diff --git a/cpukit/posix/src/prwlocktimedwrlock.c b/cpukit/posix/src/prwlocktimedwrlock.c index 4b44e6934d..62c0b2c911 100644 --- a/cpukit/posix/src/prwlocktimedwrlock.c +++ b/cpukit/posix/src/prwlocktimedwrlock.c @@ -66,6 +66,7 @@ int pthread_rwlock_timedwrlock( do_wait = false; break; case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: + default: /* only to silence warnings */ do_wait = true; break; } diff --git a/cpukit/posix/src/semopen.c b/cpukit/posix/src/semopen.c index 72920e4938..b51d2043be 100644 --- a/cpukit/posix/src/semopen.c +++ b/cpukit/posix/src/semopen.c @@ -130,7 +130,7 @@ return_id: the_semaphore->Semaphore_id = the_semaphore->Object.id; id = &the_semaphore->Semaphore_id; #else - id = &the_semaphore->Object.id; + id = (sem_t *)&the_semaphore->Object.id; #endif return id; } |