about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-25 08:44:43 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-25 08:44:43 +0000
commit6d497bbef7f18e37f862c2eaa1820f87546936e1 (patch)
tree534e2ec81ac34ec866783d811a0124da1867366c /linuxthreads
parent5a47e7f2a85ecc103175095c0f4104065fd4d8db (diff)
downloadglibc-6d497bbef7f18e37f862c2eaa1820f87546936e1.tar.gz
glibc-6d497bbef7f18e37f862c2eaa1820f87546936e1.tar.xz
glibc-6d497bbef7f18e37f862c2eaa1820f87546936e1.zip
Update.
	* libio/tst-freopen.c (main): Use correct formats for __LINE__.
	* libio/tst-mmap-setvbuf.c (main): Likewise.
	* libio/tst-widetext.c (main): Likewise.

	* libio/tst-mmap-eofsync.c (do_test): Use correct format in error
	message.
	* libio/tst-mmap-fflushsync.c (do_test): Likewise.
	* libio/tst-mmap2-eofsync.c (do_test): Likewise.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog4
-rw-r--r--linuxthreads/Examples/ex17.c4
-rw-r--r--linuxthreads/Examples/ex9.c11
-rw-r--r--linuxthreads/tst-context.c2
4 files changed, 12 insertions, 9 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 814dba02b3..b792a2fa85 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* Examples/ex9.c (thread): Remove incorrect return statement.
+
 2002-08-23  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread.c (__linuxthreads_version): New global constant.
diff --git a/linuxthreads/Examples/ex17.c b/linuxthreads/Examples/ex17.c
index a3ab909990..1bc09a5bda 100644
--- a/linuxthreads/Examples/ex17.c
+++ b/linuxthreads/Examples/ex17.c
@@ -53,7 +53,7 @@ main (void)
 
   if (stack2 != stack || stacksize != STACKSIZE)
     {
-      printf ("first pthread_attr_getstack returned different stack (%p,%x)\n"
+      printf ("first pthread_attr_getstack returned different stack (%p,%zx)\n"
 	      "than was set by setstack (%p,%x)\n",
 	      stack2, stacksize, stack, STACKSIZE);
       return 2;
@@ -89,7 +89,7 @@ main (void)
 
   if (stack2 != stack || stacksize != STACKSIZE)
     {
-      printf ("second pthread_attr_getstack returned different stack (%p,%x)\n"
+      printf ("second pthread_attr_getstack returned different stack (%p,%zx)\n"
 	      "than was set by setstack (%p,%x)\n",
 	      stack2, stacksize, stack, STACKSIZE);
       return 3;
diff --git a/linuxthreads/Examples/ex9.c b/linuxthreads/Examples/ex9.c
index e2421a5c41..1e844a7e07 100644
--- a/linuxthreads/Examples/ex9.c
+++ b/linuxthreads/Examples/ex9.c
@@ -1,5 +1,5 @@
 /* Tests for pthread_barrier_* functions.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Kaz Kylheku <kaz@ashi.footprints.net>, 2000.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ static pthread_barrier_t barrier;
 int
 main (void)
 {
-  pthread_t thread_list[NUM_THREADS]; 
+  pthread_t thread_list[NUM_THREADS];
   int i;
 
   if (pthread_barrier_init (&barrier, NULL, NUM_THREADS + 1) != 0)
@@ -69,13 +69,13 @@ thread (void *arg)
 	{
 	case 0:
 	  flockfile (stdout);
-	  printf ("%04d: non-serial thread %lu\n", ++linecount, 
+	  printf ("%04d: non-serial thread %lu\n", ++linecount,
 		  (unsigned long) self);
 	  funlockfile (stdout);
 	  break;
 	case PTHREAD_BARRIER_SERIAL_THREAD:
 	  flockfile (stdout);
-	  printf ("%04d: serial thread %lu\n", ++linecount, 
+	  printf ("%04d: serial thread %lu\n", ++linecount,
 		  (unsigned long) self);
 	  funlockfile (stdout);
 	  last_serial_thread = self;
@@ -89,10 +89,9 @@ thread (void *arg)
   if (pthread_equal (self, last_serial_thread))
   {
     flockfile (stdout);
-    printf ("%04d: last serial thread %lu terminating process\n", 
+    printf ("%04d: last serial thread %lu terminating process\n",
 	    ++linecount, (unsigned long) self);
     funlockfile (stdout);
-    return;
   }
 
   pthread_exit(NULL);
diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c
index 9066e837e2..5c3272a4fb 100644
--- a/linuxthreads/tst-context.c
+++ b/linuxthreads/tst-context.c
@@ -98,7 +98,7 @@ main (void)
     }
 
   for (n = 0; n < N; ++n)
-    if (pthread_create (&th[n], NULL, threadfct, (void *) n) != 0)
+    if (pthread_create (&th[n], NULL, threadfct, (void *) (long int) n) != 0)
       error (EXIT_FAILURE, errno, "cannot create all threads");
 
   for (n = 0; n < N; ++n)