From 39615f481a74f1d4d612b734ea8a126e4e43b407 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 27 Oct 2009 14:10:54 +0000 Subject: Use PRIxpthread_t to print pthread_t's. --- testsuites/psxtests/psx01/init.c | 2 +- testsuites/psxtests/psx01/task.c | 2 +- testsuites/psxtests/psx02/init.c | 2 +- testsuites/psxtests/psx03/init.c | 4 ++-- testsuites/psxtests/psx04/init.c | 6 +++--- testsuites/psxtests/psx05/init.c | 2 +- testsuites/psxtests/psx06/init.c | 2 +- testsuites/psxtests/psx07/init.c | 2 +- testsuites/psxtests/psx08/init.c | 2 +- testsuites/psxtests/psx09/init.c | 2 +- testsuites/psxtests/psx10/task.c | 2 +- testsuites/psxtests/psx10/task2.c | 2 +- testsuites/psxtests/psx10/task3.c | 2 +- testsuites/psxtests/psx11/init.c | 2 +- testsuites/psxtests/psx12/init.c | 2 +- testsuites/psxtests/psxalarm01/init.c | 4 ++-- testsuites/psxtests/psxbarrier01/test.c | 4 ++-- testsuites/psxtests/psxkey01/init.c | 2 +- testsuites/psxtests/psxkey01/task.c | 2 +- testsuites/psxtests/psxmsgq02/init.c | 2 +- testsuites/psxtests/psxsignal01/init.c | 8 ++++---- testsuites/psxtests/psxualarm/init.c | 4 ++-- 22 files changed, 31 insertions(+), 31 deletions(-) (limited to 'testsuites') diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c index e548e70221..f2dda08db7 100644 --- a/testsuites/psxtests/psx01/init.c +++ b/testsuites/psxtests/psx01/init.c @@ -45,7 +45,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init: ID is 0x%08x\n", Init_id ); + printf( "Init: ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* exercise get minimum priority */ diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c index 5b8e3801b3..5943295411 100644 --- a/testsuites/psxtests/psx01/task.c +++ b/testsuites/psxtests/psx01/task.c @@ -48,7 +48,7 @@ void *Task_1_through_3( /* get id of this thread */ Task_id = pthread_self(); - printf( "Task_1: ID is 0x%08x\n", Task_id ); + printf( "Task_1: ID is 0x%08" PRIxpthread_t "\n", Task_id ); /* exercise pthread_equal */ diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c index 23c36251da..0f03f0e1d4 100644 --- a/testsuites/psxtests/psx02/init.c +++ b/testsuites/psxtests/psx02/init.c @@ -51,7 +51,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* install a signal handler */ diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c index 628bdd8010..40d09fb73a 100644 --- a/testsuites/psxtests/psx03/init.c +++ b/testsuites/psxtests/psx03/init.c @@ -24,7 +24,7 @@ void Signal_handler( { Signal_count++; printf( - "Signal: %d caught by 0x%x (%d)\n", + "Signal: %d caught by 0x%" PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -53,7 +53,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* install a signal handler */ diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c index 6286c73708..45f1a067cb 100644 --- a/testsuites/psxtests/psx04/init.c +++ b/testsuites/psxtests/psx04/init.c @@ -29,7 +29,7 @@ void Signal_handler( { Signal_count++; printf( - "Signal: %d caught by 0x%x (%d)\n", + "Signal: %d caught by 0x%" PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -45,7 +45,7 @@ void Signal_info_handler( { Signal_count++; printf( - "Signal_info: %d caught by 0x%x (%d) si_signo= %d si_code= %d value= %d\n", + "Signal_info: %d caught by 0x%" PRIxpthread_t " (%d) si_signo= %d si_code= %d value= %d\n", signo, pthread_self(), Signal_count, @@ -78,7 +78,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* generate some easy error cases */ diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c index 0c5f7718d4..906f95b986 100644 --- a/testsuites/psxtests/psx05/init.c +++ b/testsuites/psxtests/psx05/init.c @@ -135,7 +135,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* tes pthread_mutex_attr_init */ diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c index 65094792b7..eab79e3d39 100644 --- a/testsuites/psxtests/psx06/init.c +++ b/testsuites/psxtests/psx06/init.c @@ -47,7 +47,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* create a couple of threads */ diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c index 3c4403cc6b..7b57d0df6d 100644 --- a/testsuites/psxtests/psx07/init.c +++ b/testsuites/psxtests/psx07/init.c @@ -78,7 +78,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* exercise init and destroy */ diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c index 9f0e2636d5..827014604d 100644 --- a/testsuites/psxtests/psx08/init.c +++ b/testsuites/psxtests/psx08/init.c @@ -29,7 +29,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); puts( "Init: pthread_detach - ESRCH (invalid id)" ); status = pthread_detach( (pthread_t) -1 ); diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c index 797ad9ec0e..a2e995316a 100644 --- a/testsuites/psxtests/psx09/init.c +++ b/testsuites/psxtests/psx09/init.c @@ -66,7 +66,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* try to use this thread as a sporadic server */ diff --git a/testsuites/psxtests/psx10/task.c b/testsuites/psxtests/psx10/task.c index 7a1b5b9705..fb49b1544a 100644 --- a/testsuites/psxtests/psx10/task.c +++ b/testsuites/psxtests/psx10/task.c @@ -28,7 +28,7 @@ void *Task_1( /* wait for a condition variable signal from Init */ Task_id = pthread_self(); - printf( "Task_1: ID is 0x%08x\n", Task_id ); + printf( "Task_1: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_init( &Mutex_id, NULL ); assert( !status ); diff --git a/testsuites/psxtests/psx10/task2.c b/testsuites/psxtests/psx10/task2.c index 081616f339..6aef292030 100644 --- a/testsuites/psxtests/psx10/task2.c +++ b/testsuites/psxtests/psx10/task2.c @@ -26,7 +26,7 @@ void *Task_2( int status; Task_id = pthread_self(); - printf( "Task_2: ID is 0x%08x\n", Task_id ); + printf( "Task_2: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_lock( &Mutex_id ); assert( !status ); diff --git a/testsuites/psxtests/psx10/task3.c b/testsuites/psxtests/psx10/task3.c index b56d736bf4..fdf18fbe8f 100644 --- a/testsuites/psxtests/psx10/task3.c +++ b/testsuites/psxtests/psx10/task3.c @@ -26,7 +26,7 @@ void *Task_3( int status; Task_id = pthread_self(); - printf( "Task_3: ID is 0x%08x\n", Task_id ); + printf( "Task_3: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_lock( &Mutex_id ); assert( !status ); diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c index 0c4d4243e1..136647a27f 100644 --- a/testsuites/psxtests/psx11/init.c +++ b/testsuites/psxtests/psx11/init.c @@ -36,7 +36,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* exercise pthread_setschedparam */ diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c index 33d09d40f5..6000e83bc4 100644 --- a/testsuites/psxtests/psx12/init.c +++ b/testsuites/psxtests/psx12/init.c @@ -56,7 +56,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); /* invalid scheduling policy error */ diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c index 8080d754e9..3f316d9db6 100644 --- a/testsuites/psxtests/psxalarm01/init.c +++ b/testsuites/psxtests/psxalarm01/init.c @@ -29,7 +29,7 @@ void Signal_handler( { Signal_count++; printf( - "Signal: %d caught by 0x%x (%d)\n", + "Signal: %d caught by 0x%" PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -45,7 +45,7 @@ void Signal_info_handler( { Signal_count++; printf( - "Signal_info: %d caught by 0x%x (%d) si_signo= %d si_code= %d value= %d\n", + "Signal_info: %d caught by 0x%" PRIxpthread_t " (%d) si_signo= %d si_code= %d value= %d\n", signo, pthread_self(), Signal_count, diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c index 838041791c..7ddc99b912 100644 --- a/testsuites/psxtests/psxbarrier01/test.c +++ b/testsuites/psxtests/psxbarrier01/test.c @@ -29,9 +29,9 @@ void *BarrierThread(void *arg) pthread_t id = *(pthread_t *) arg; int status; - printf( "pthread_barrier_wait( &Barrier ) for thread 0x%08x\n", id ); + printf( "pthread_barrier_wait( &Barrier ) for thread 0x%08" PRIxpthread_t "\n", id ); status = pthread_barrier_wait( &Barrier ); - printf( "pthread_barrier_wait - 0x%08x released\n", id ); + printf( "pthread_barrier_wait - 0x%08" PRIxpthread_t " released\n", id ); assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); return NULL; diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c index e71ee612bf..1213ff582d 100644 --- a/testsuites/psxtests/psxkey01/init.c +++ b/testsuites/psxtests/psxkey01/init.c @@ -40,7 +40,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); Allocate_majority_of_workspace(84); diff --git a/testsuites/psxtests/psxkey01/task.c b/testsuites/psxtests/psxkey01/task.c index 00d9249ca3..9a81ec85a5 100644 --- a/testsuites/psxtests/psxkey01/task.c +++ b/testsuites/psxtests/psxkey01/task.c @@ -29,7 +29,7 @@ void *Task_1( int status; uint32_t *key_data; - printf( "Thread 0x%08x\n", id ); + printf( "Thread 0x%08" PRIxpthread_t "\n", id ); printf( "Task_1: Setting the key to %d\n", 1 ); status = pthread_setspecific( Key_id[0], (void *)&Data_array[ 1 ] ); if ( status ) diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c index 5aa4bc88d1..4ddb142eca 100644 --- a/testsuites/psxtests/psxmsgq02/init.c +++ b/testsuites/psxtests/psxmsgq02/init.c @@ -42,7 +42,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); Allocate_majority_of_workspace(NAME_MAX); diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c index ca562636c1..00098d22db 100644 --- a/testsuites/psxtests/psxsignal01/init.c +++ b/testsuites/psxtests/psxsignal01/init.c @@ -26,7 +26,7 @@ void Handler_1( { Signal_count++; printf( - "Handler_1: Signal: %d caught by 0x%x (%d)\n", + "Handler_1: Signal: %d caught by 0x%" PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -40,7 +40,7 @@ void Signal_handler( { Signal_count++; printf( - "Signal: %d caught by 0x%x (%d)\n", + "Signal: %d caught by 0x%"PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -56,7 +56,7 @@ void Signal_info_handler( { Signal_count++; printf( - "Signal_info: %d caught by 0x%x (%d) si_signo= %d si_code= %d value= %d\n", + "Signal_info: %d caught by 0x%" PRIxpthread_t " (%d) si_signo= %d si_code= %d value= %d\n", signo, pthread_self(), Signal_count, @@ -97,7 +97,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); Signal_occurred = 0; Signal_count = 0; diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c index 9900fa9bf8..8c49d7f38e 100644 --- a/testsuites/psxtests/psxualarm/init.c +++ b/testsuites/psxtests/psxualarm/init.c @@ -27,7 +27,7 @@ void Signal_handler( { Signal_count++; printf( - "Signal: %d caught by 0x%x (%d)\n", + "Signal: %d caught by 0x%" PRIxpthread_t " (%d)\n", signo, pthread_self(), Signal_count @@ -63,7 +63,7 @@ void *POSIX_Init( /* get id of this thread */ Init_id = pthread_self(); - printf( "Init's ID is 0x%08x\n", Init_id ); + printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); Signal_occurred = 0; Signal_count = 0; -- cgit v1.2.3