From b6912c40f8ec9c74a51d136da78e449033be7e14 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 25 Oct 2009 06:25:04 +0000 Subject: Remove unused vars. Add missing prototypes. --- testsuites/psxtests/psx01/init.c | 2 -- testsuites/psxtests/psxalarm01/init.c | 4 ---- testsuites/psxtests/psxbarrier01/test.c | 2 -- testsuites/psxtests/psxclock/init.c | 2 -- testsuites/psxtests/psxfatal01/testcase.h | 2 +- testsuites/psxtests/psxfatal02/testcase.h | 2 +- testsuites/psxtests/psxhdrs/signal12.c | 2 +- testsuites/psxtests/psxkey01/init.c | 5 ---- testsuites/psxtests/psxkey03/init.c | 1 - testsuites/psxtests/psxmsgq01/init.c | 40 +++++++++++++++---------------- testsuites/psxtests/psxmsgq02/init.c | 6 ----- testsuites/psxtests/psxmsgq03/init.c | 1 - testsuites/psxtests/psxreaddir/test.c | 2 +- testsuites/psxtests/psxrwlock01/test.c | 1 - testsuites/psxtests/psxsignal01/init.c | 4 ---- testsuites/psxtests/psxsignal02/init.c | 2 -- testsuites/psxtests/psxsignal03/init.c | 3 --- testsuites/psxtests/psxspin01/test.c | 4 ---- testsuites/psxtests/psxspin02/test.c | 5 ---- testsuites/psxtests/psxstack01/init.c | 1 - testsuites/psxtests/psxstat/test.c | 8 +++---- testsuites/psxtests/psxualarm/init.c | 7 ------ 22 files changed, 28 insertions(+), 78 deletions(-) (limited to 'testsuites/psxtests') diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c index c548dc64a6..e548e70221 100644 --- a/testsuites/psxtests/psx01/init.c +++ b/testsuites/psxtests/psx01/init.c @@ -18,12 +18,10 @@ void *POSIX_Init( void *argument ) { - struct timespec tv; struct timespec tr; int status; int priority; pthread_t thread_id; - struct tm tm; struct utsname uts; puts( "\n\n*** POSIX TEST 1 ***" ); diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c index e09adfa8d8..8080d754e9 100644 --- a/testsuites/psxtests/psxalarm01/init.c +++ b/testsuites/psxtests/psxalarm01/init.c @@ -64,10 +64,6 @@ void *POSIX_Init( int sc; struct sigaction act; sigset_t mask; - sigset_t pending_set; - sigset_t oset; - struct timespec timeout; - siginfo_t info; puts( "\n\n*** POSIX ALARM TEST 01 ***" ); diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c index df290e68b2..838041791c 100644 --- a/testsuites/psxtests/psxbarrier01/test.c +++ b/testsuites/psxtests/psxbarrier01/test.c @@ -52,13 +52,11 @@ int main( ) #endif { - pthread_barrier_t another_barrier; pthread_barrier_t bad_barrier = 100; pthread_barrier_t barrier; pthread_barrierattr_t attr; int status; int p; - pthread_t thread_id; int i; puts( "\n\n*** POSIX BARRIER TEST 01 ***" ); diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c index a18231bb9c..9261774c96 100644 --- a/testsuites/psxtests/psxclock/init.c +++ b/testsuites/psxtests/psxclock/init.c @@ -30,8 +30,6 @@ rtems_task Init( struct timespec tv; struct timespec tr; int sc; - int priority; - pthread_t thread_id; time_t seconds; time_t seconds1; unsigned int remaining; diff --git a/testsuites/psxtests/psxfatal01/testcase.h b/testsuites/psxtests/psxfatal01/testcase.h index 01ab0b6836..c8c4ba8194 100644 --- a/testsuites/psxtests/psxfatal01/testcase.h +++ b/testsuites/psxtests/psxfatal01/testcase.h @@ -30,7 +30,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR EFAULT -void force_error() +void force_error(void) { /* we will not run this far */ } diff --git a/testsuites/psxtests/psxfatal02/testcase.h b/testsuites/psxtests/psxfatal02/testcase.h index 09dd5b80f8..d03b9b2c4f 100644 --- a/testsuites/psxtests/psxfatal02/testcase.h +++ b/testsuites/psxtests/psxfatal02/testcase.h @@ -30,7 +30,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR EAGAIN -void force_error() +void force_error(void) { /* we will not run this far */ } diff --git a/testsuites/psxtests/psxhdrs/signal12.c b/testsuites/psxtests/psxhdrs/signal12.c index 8b1e70f3df..36664a8b6e 100644 --- a/testsuites/psxtests/psxhdrs/signal12.c +++ b/testsuites/psxtests/psxhdrs/signal12.c @@ -18,7 +18,7 @@ void test( void ); void test( void ) { - void (*signal_function_pointer)(); + void (*signal_function_pointer)(int); int signal_number; signal_number = SIGALRM; diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c index 278e4b6029..b8718d7bb3 100644 --- a/testsuites/psxtests/psxkey01/init.c +++ b/testsuites/psxtests/psxkey01/init.c @@ -29,11 +29,6 @@ void *POSIX_Init( ) { int status; - unsigned int remaining; - uint32_t *key_data; - Heap_Information_block info; - void *temp; - int i; puts( "\n\n*** POSIX KEY 01 TEST ***" ); diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c index 4de2bb353f..70de64a9ca 100644 --- a/testsuites/psxtests/psxkey03/init.c +++ b/testsuites/psxtests/psxkey03/init.c @@ -42,7 +42,6 @@ void *POSIX_Init( { pthread_t thread; int sc; - bool sb; puts( "\n\n*** TEST KEY 03 ***" ); diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c index 8297bf46fb..4009033ac2 100644 --- a/testsuites/psxtests/psxmsgq01/init.c +++ b/testsuites/psxtests/psxmsgq01/init.c @@ -110,7 +110,7 @@ char *Build_Queue_Name( int i ) { return Queue_Name; } -void open_test_queues() +void open_test_queues(void) { struct mq_attr attr; int status; @@ -146,7 +146,7 @@ void open_test_queues() * opened but closes the rest. */ -void validate_mq_open_error_codes() +void validate_mq_open_error_codes(void) { int i; mqd_t n_mq2; @@ -291,7 +291,7 @@ void validate_mq_open_error_codes() } } -void validate_mq_unlink_error_codes() +void validate_mq_unlink_error_codes(void) { int status; @@ -349,7 +349,7 @@ void validate_mq_unlink_error_codes() fatal_posix_service_status( errno, EINVAL, "mq_unlink errno value"); } -void validate_mq_close_error_codes() +void validate_mq_close_error_codes(void) { int status; @@ -366,7 +366,7 @@ void validate_mq_close_error_codes() } -void validate_mq_getattr_error_codes() +void validate_mq_getattr_error_codes(void) { struct mq_attr attr; int status; @@ -523,7 +523,7 @@ int empty_message_queues( * first queue. */ -int validate_mq_send_error_codes( ) +int validate_mq_send_error_codes(void) { int status; int i; @@ -606,7 +606,7 @@ int validate_mq_send_error_codes( ) return i-1; } -void validate_mq_receive_error_codes( ) +void validate_mq_receive_error_codes(void) { int status; char message[100]; @@ -667,7 +667,7 @@ void validate_mq_receive_error_codes( ) */ } -void verify_open_functionality() +void verify_open_functionality(void) { #if 0 mqd_t n_mq; @@ -687,7 +687,7 @@ void verify_open_functionality() #endif } -void verify_unlink_functionality() +void verify_unlink_functionality(void) { mqd_t n_mq; int status; @@ -716,7 +716,7 @@ void verify_unlink_functionality() Test_q[ DEFAULT_RW ].mq = n_mq; } -void verify_close_functionality() +void verify_close_functionality(void) { int i; int status; @@ -769,7 +769,7 @@ void verify_timed_send_queue( Test_q[que].count++; } -void verify_timed_send() +void verify_timed_send(void) { int que; @@ -819,7 +819,7 @@ void verify_timed_receive_queue( } -void verify_timed_receive() +void verify_timed_receive(void) { int que; @@ -834,7 +834,7 @@ void verify_timed_receive() } #if (0) -void verify_set_attr() +void verify_set_attr(void) { struct mq_attr save_attr[ NUMBER_OF_TEST_QUEUES ]; struct mq_attr attr; @@ -903,7 +903,7 @@ void wait_for_signal( } } -void verify_notify() +void verify_notify(void) { struct sigevent event; int status; @@ -988,7 +988,7 @@ void verify_notify() } -void verify_with_threads() +void verify_with_threads(void) { int status; pthread_t id; @@ -1075,7 +1075,7 @@ void verify_with_threads() } -void validate_mq_setattr() +void validate_mq_setattr(void) { struct mq_attr attr; struct mq_attr save_attr[ NUMBER_OF_TEST_QUEUES ]; @@ -1163,11 +1163,11 @@ void verify_timedout_mq_timedreceive( fatal_int_service_status( status, -1, "mq_timedreceive status"); +/* FIXME: This is wrong. */ printf( "Init: %ld sec %ld us\n", (long)tv3.tv_sec, (long)tv3.tv_usec ); - } -void verify_mq_receive() +void verify_mq_receive(void) { int que; @@ -1213,7 +1213,7 @@ void verify_timedout_mq_timedsend( Test_q[que].count++; } -void verify_mq_send() +void verify_mq_send(void) { int que; @@ -1307,7 +1307,7 @@ void *Task_3 ( * close and unlink all queues. */ - verify_close_functionality( "Task_3: " ); + verify_close_functionality(); puts( "Task_3: pthread_exit" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c index e359557e9b..af19320f17 100644 --- a/testsuites/psxtests/psxmsgq02/init.c +++ b/testsuites/psxtests/psxmsgq02/init.c @@ -29,14 +29,8 @@ void *POSIX_Init( void *argument ) { - int status; - unsigned int remaining; struct mq_attr attr; - int que; - Heap_Information_block info; - void *temp; mqd_t mq; - int i; puts( "\n\n*** POSIX MESSAGE QUEUE 02 TEST ***" ); diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c index ad55e1c0d3..0d8c275f6f 100644 --- a/testsuites/psxtests/psxmsgq03/init.c +++ b/testsuites/psxtests/psxmsgq03/init.c @@ -42,7 +42,6 @@ void *POSIX_Init( { struct mq_attr attr; int status; - int msgBody; rtems_id timer; rtems_status_code rc; diff --git a/testsuites/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c index 972fab9a64..9d187e57fe 100644 --- a/testsuites/psxtests/psxreaddir/test.c +++ b/testsuites/psxtests/psxreaddir/test.c @@ -182,7 +182,7 @@ int compare_descending( const struct dirent **a, const struct dirent **b ) return i; } -void test_across_mount() +void test_across_mount(void) { rtems_filesystem_mount_table_entry_t *mt_entry; int status; diff --git a/testsuites/psxtests/psxrwlock01/test.c b/testsuites/psxtests/psxrwlock01/test.c index fa5a92bc1b..11727c9e69 100644 --- a/testsuites/psxtests/psxrwlock01/test.c +++ b/testsuites/psxtests/psxrwlock01/test.c @@ -77,7 +77,6 @@ int main( pthread_rwlockattr_t attr; int status; int p; - pthread_t thread_id; int i; struct timespec abstime; diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c index 30416bdb4a..ca562636c1 100644 --- a/testsuites/psxtests/psxsignal01/init.c +++ b/testsuites/psxtests/psxsignal01/init.c @@ -84,10 +84,6 @@ void *POSIX_Init( int status; struct sigaction act; sigset_t mask; - sigset_t pending_set; - sigset_t oset; - struct timespec timeout; - siginfo_t info; sighandler_t oldHandler; sighandler_t newHandler; rtems_interval start, end; diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c index 52cca31fc2..8e22db4e5e 100644 --- a/testsuites/psxtests/psxsignal02/init.c +++ b/testsuites/psxtests/psxsignal02/init.c @@ -33,8 +33,6 @@ void Install_Signal_Handler( { int sc; sigset_t mask; - sigset_t pending_set; - sigset_t oset; sc = sigemptyset( &mask ); assert( !sc ); diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c index dd22f0a114..1e90677ea6 100644 --- a/testsuites/psxtests/psxsignal03/init.c +++ b/testsuites/psxtests/psxsignal03/init.c @@ -85,8 +85,6 @@ void *Test_Thread(void *arg) int sc; sigset_t mask; sigset_t wait_mask; - sigset_t pending_set; - sigset_t oset; siginfo_t info; if ( blocked ) @@ -141,7 +139,6 @@ void *POSIX_Init( void *argument ) { - int i; int sc; pthread_t id; struct sigaction act; diff --git a/testsuites/psxtests/psxspin01/test.c b/testsuites/psxtests/psxspin01/test.c index ad3a4aa913..9b437cc68f 100644 --- a/testsuites/psxtests/psxspin01/test.c +++ b/testsuites/psxtests/psxspin01/test.c @@ -65,11 +65,7 @@ int main( #endif { pthread_spinlock_t spinlock; - pthread_spinlock_t spinlockExtra; int status; - int p; - pthread_t thread_id; - int i; rtems_status_code rstatus; rtems_id taskid; diff --git a/testsuites/psxtests/psxspin02/test.c b/testsuites/psxtests/psxspin02/test.c index df71b8e795..56bb6614f0 100644 --- a/testsuites/psxtests/psxspin02/test.c +++ b/testsuites/psxtests/psxspin02/test.c @@ -50,12 +50,7 @@ int main( ) #endif { - pthread_spinlock_t spinlock; - pthread_spinlock_t spinlockExtra; int status; - int p; - pthread_t thread_id; - int i; rtems_status_code rstatus; rtems_id taskid; diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c index 9d9e1055a9..70a4b65949 100644 --- a/testsuites/psxtests/psxstack01/init.c +++ b/testsuites/psxtests/psxstack01/init.c @@ -46,7 +46,6 @@ void *POSIX_Init( void *argument ) { - int i; int sc; pthread_t id; pthread_attr_t attr; diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c index 41489f9328..34f1952b66 100644 --- a/testsuites/psxtests/psxstat/test.c +++ b/testsuites/psxtests/psxstat/test.c @@ -325,7 +325,7 @@ void make_multiple_links( } -void make_too_many_links() +void make_too_many_links(void) { int i; int status; @@ -379,7 +379,7 @@ void make_a_symlink( assert( !status ); } -void make_multiple_symlinks() +void make_multiple_symlinks(void) { int status; @@ -467,7 +467,7 @@ void make_multiple_directories( */ -void Cause_faults() +void Cause_faults(void) { int fd; int status; @@ -711,7 +711,7 @@ void Cause_faults() } -void Show_Time() +void Show_Time(void) { rtems_time_of_day time; rtems_status_code status; diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c index 0a8461bff0..9900fa9bf8 100644 --- a/testsuites/psxtests/psxualarm/init.c +++ b/testsuites/psxtests/psxualarm/init.c @@ -53,13 +53,6 @@ void *POSIX_Init( useconds_t result; struct sigaction act; sigset_t mask; - sigset_t pending_set; - sigset_t oset; - struct timespec timeout; - siginfo_t info; - sighandler_t oldHandler; - sighandler_t newHandler; - rtems_interval start, end; puts( "\n\n*** POSIX TEST UALARM ***" ); -- cgit v1.2.3