[git commit] commentary typo fix

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed May 11 20:22:51 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=c91c3a2b27f5909e190cde4518383864298e82af
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

use cancellation (with two 'l') uniformly.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/sysdeps/linux/x86_64/sys/epoll.h          |    6 +++---
 libpthread/linuxthreads.old/cancel.c           |    2 +-
 libpthread/linuxthreads.old/pthread.c          |    2 +-
 libpthread/linuxthreads.old/wrapsyscall.c      |    2 +-
 libpthread/nptl/ChangeLog                      |    4 ++--
 libpthread/nptl/pthreadP.h                     |    2 +-
 libpthread/nptl/sysdeps/pthread/pthread_once.c |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libc/sysdeps/linux/x86_64/sys/epoll.h b/libc/sysdeps/linux/x86_64/sys/epoll.h
index a8171cc..bd5b308 100644
--- a/libc/sysdeps/linux/x86_64/sys/epoll.h
+++ b/libc/sysdeps/linux/x86_64/sys/epoll.h
@@ -73,9 +73,9 @@ enum EPOLL_EVENTS
 
 
 /* Valid opcodes ( "op" parameter ) to issue to epoll_ctl().  */
-#define EPOLL_CTL_ADD 1	/* Add a file decriptor to the interface.  */
-#define EPOLL_CTL_DEL 2	/* Remove a file decriptor from the interface.  */
-#define EPOLL_CTL_MOD 3	/* Change file decriptor epoll_event structure.  */
+#define EPOLL_CTL_ADD 1	/* Add a file descriptor to the interface.  */
+#define EPOLL_CTL_DEL 2	/* Remove a file descriptor from the interface.  */
+#define EPOLL_CTL_MOD 3	/* Change file descriptor epoll_event structure.  */
 
 
 typedef union epoll_data
diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c
index 47534be..0e5defb 100644
--- a/libpthread/linuxthreads.old/cancel.c
+++ b/libpthread/linuxthreads.old/cancel.c
@@ -213,7 +213,7 @@ void __pthread_perform_cleanup(char *currentframe)
 }
 
 #ifndef __PIC__
-/* We need a hook to force the cancelation wrappers to be linked in when
+/* We need a hook to force the cancellation wrappers to be linked in when
    static libpthread is used.  */
 extern const char __pthread_provide_wrappers;
 static const char *const __pthread_require_wrappers =
diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c
index a8830b1..42e03f4 100644
--- a/libpthread/linuxthreads.old/pthread.c
+++ b/libpthread/linuxthreads.old/pthread.c
@@ -1159,7 +1159,7 @@ void __pthread_message(char * fmt, ...)
 
 
 #ifndef __PIC__
-/* We need a hook to force the cancelation wrappers to be linked in when
+/* We need a hook to force the cancellation wrappers to be linked in when
    static libpthread is used.  */
 extern const char __pthread_provide_wrappers;
 static const char *const __pthread_require_wrappers =
diff --git a/libpthread/linuxthreads.old/wrapsyscall.c b/libpthread/linuxthreads.old/wrapsyscall.c
index 6e18388..e69ed6c 100644
--- a/libpthread/linuxthreads.old/wrapsyscall.c
+++ b/libpthread/linuxthreads.old/wrapsyscall.c
@@ -1,4 +1,4 @@
-/* Wrapper arpund system calls to provide cancelation points.
+/* Wrapper arpund system calls to provide cancellation points.
    Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
diff --git a/libpthread/nptl/ChangeLog b/libpthread/nptl/ChangeLog
index c81eb03..8ec6acd 100644
--- a/libpthread/nptl/ChangeLog
+++ b/libpthread/nptl/ChangeLog
@@ -6717,7 +6717,7 @@
 
 2003-07-15  Ulrich Drepper  <drepper at redhat.com>
 
-	* tst-tcancel-wrappers.sh: lseek and llseek are not cancelation points.
+	* tst-tcancel-wrappers.sh: lseek and llseek are not cancellation points.
 
 2003-07-14  Ulrich Drepper  <drepper at redhat.com>
 
@@ -10990,7 +10990,7 @@
 	the static TLS block.
 	(allocate_stack): Call _dl_allocate_tls_init for user-provided stack.
 
-	* cancellation.c: Renamed from cancelation.c.
+	* cancellation.c: Renamed from cancellation.c.
 	* Makefile: Adjust accordingly.
 	* pthreadP.h (CANCELLATION_P): Renamed from CANCELATION_P.
 	* cleanup_defer.c: Use CANCELLATION_P.
diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
index fb354ea..850562b 100644
--- a/libpthread/nptl/pthreadP.h
+++ b/libpthread/nptl/pthreadP.h
@@ -312,7 +312,7 @@ __do_cancel (void)
 # define LIBC_CANCEL_HANDLED()	/* Nothing.  */
 #endif
 
-/* The signal used for asynchronous cancelation.  */
+/* The signal used for asynchronous cancellation.  */
 #define SIGCANCEL	__SIGRTMIN
 
 
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_once.c b/libpthread/nptl/sysdeps/pthread/pthread_once.c
index 57bb6b9..5513109 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_once.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_once.c
@@ -38,7 +38,7 @@ __pthread_once (
       lll_lock (once_lock, LLL_PRIVATE);
 
       /* XXX This implementation is not complete.  It doesn't take
-	 cancelation and fork into account.  */
+	 cancellation and fork into account.  */
       if (*once_control == PTHREAD_ONCE_INIT)
 	{
 	  init_routine ();
-- 
1.7.3.4



More information about the uClibc-cvs mailing list