[Xenomai-git] Gilles Chanteperdrix : testsuite: fix compilation warnings

[GIT version control]

Module: xenomai-2.5
Branch: master
Commit: 4709ce5a78e97bef7517cc47bb9555dffbb4e89b
URL:    
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=4709ce5a78e97bef7517cc47bb9555dffbb4e89b

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Mon Mar  8 11:36:16 2010 +0100

testsuite: fix compilation warnings

---

 src/testsuite/unit/check-vdso.c    |    1 -
 src/testsuite/unit/cond-torture.c  |   14 +++++++++++++-
 src/testsuite/unit/mutex-torture.c |    1 -
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/testsuite/unit/check-vdso.c b/src/testsuite/unit/check-vdso.c
index 38805be..8f90420 100644
--- a/src/testsuite/unit/check-vdso.c
+++ b/src/testsuite/unit/check-vdso.c
@@ -13,7 +13,6 @@ extern unsigned long xeno_sem_heap[2];
 int main(int argc, char **argv)
 {
        unsigned long long test_features;
-       int err;
 
        if (argc != 2) {
                printf("No specific feature(s) given, using XNVDSO_FEATURE\n");
diff --git a/src/testsuite/unit/cond-torture.c 
b/src/testsuite/unit/cond-torture.c
index a5578e8..a20e12f 100644
--- a/src/testsuite/unit/cond-torture.c
+++ b/src/testsuite/unit/cond-torture.c
@@ -50,15 +50,17 @@ int mutex_init(mutex_t *mutex, int type, int pi)
        if (pi != 0)
 #ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
                pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT);
+
+       err = pthread_mutex_init(mutex, &mattr);
 #else
        else {
                err = ENOSYS;
                goto out;
        }
-#endif
        err = pthread_mutex_init(mutex, &mattr);
 
   out:
+#endif
        pthread_mutexattr_destroy(&mattr);
 
        return -err;
@@ -254,6 +256,8 @@ void *cond_signaler(void *cookie)
        thread_msleep(10);
        check("cond_signal", cond_signal(cm->cond), 0);
        check("mutex_unlock", mutex_unlock(cm->mutex), 0);
+
+       return NULL;
 }
 
 void simple_condwait(void)
@@ -343,6 +347,8 @@ void *cond_killer(void *cookie)
        thread_msleep(10);
        check("thread_kill", thread_kill(cm->tid, SIGRTMIN), 0);
        check("mutex_unlock", mutex_unlock(cm->mutex), 0);
+
+       return NULL;
 }
 
 volatile int sig_seen;
@@ -458,6 +464,8 @@ void *mutex_killer(void *cookie)
        thread_msleep(10);
        check("thread_kill", thread_kill(cm->tid, SIGRTMIN), 0);
        check("mutex_unlock", mutex_unlock(cm->mutex), 0);
+
+       return NULL;
 }
 
 void sig_norestart_condwait_mutex(void)
@@ -552,6 +560,8 @@ void *double_killer(void *cookie)
        thread_msleep(10);
        check("thread_kill 2", thread_kill(cm->tid, SIGRTMIN), 0);
        check("mutex_unlock", mutex_unlock(cm->mutex), 0);
+
+       return NULL;
 }
 
 void sig_norestart_double(void)
@@ -650,6 +660,8 @@ void *cond_destroyer(void *cookie)
        check("cond_destroy", cond_destroy(cm->cond), 0);
 #endif /* native */
        check("mutex_unlock", mutex_unlock(cm->mutex), 0);
+
+       return NULL;
 }
 
 void cond_destroy_whilewait(void)
diff --git a/src/testsuite/unit/mutex-torture.c 
b/src/testsuite/unit/mutex-torture.c
index 2dc2bbc..fdcada4 100644
--- a/src/testsuite/unit/mutex-torture.c
+++ b/src/testsuite/unit/mutex-torture.c
@@ -435,7 +435,6 @@ void *timed_waiter(void *cookie)
 {
        mutex_t *mutex = (mutex_t *) cookie;
        unsigned long long start, diff;
-       int result;
 
        dispatch("timed_waiter pthread_detach", THREAD_DETACH, 1, 0);
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git