diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-25 02:23:02 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-25 02:23:02 +0100 |
commit | e71f7804caa6352ba4cec3aaf04800c9a3f88d48 (patch) | |
tree | dd9659b8939f705b541199cea567552fd5c5b0a4 | |
parent | 034e4e904a5e16356fab5b8943b91b82b7437dbb (diff) |
Fix spurious whitespaces
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | pthread/pt-alloc.c | 2 | ||||
-rw-r--r-- | pthread/pt-create.c | 2 | ||||
-rw-r--r-- | sysdeps/generic/pt-attr-setstack.c | 2 | ||||
-rw-r--r-- | sysdeps/generic/pt-cond-signal.c | 2 | ||||
-rw-r--r-- | sysdeps/generic/pt-key.h | 2 | ||||
-rw-r--r-- | sysdeps/generic/pt-rwlock-unlock.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/pt-docancel.c | 2 | ||||
-rw-r--r-- | sysdeps/mach/hurd/pt-mutexattr-gettype.c | 1 | ||||
-rw-r--r-- | sysdeps/mach/pt-wakeup.c | 2 | ||||
-rw-r--r-- | sysdeps/pthread/bits/cancelation.h | 2 | ||||
-rw-r--r-- | sysdeps/pthread/bits/pthreadtypes.h | 2 | ||||
-rw-r--r-- | sysdeps/pthread/pthread-functions.h | 12 | ||||
-rw-r--r-- | tests/test-11.c | 4 | ||||
-rw-r--r-- | tests/test-6.c | 2 | ||||
-rw-r--r-- | tests/test-7.c | 2 |
16 files changed, 24 insertions, 25 deletions
@@ -163,7 +163,7 @@ ifeq ($(IN_GLIBC),no) SRCS := $(addsuffix .c,$(libpthread-routines)) OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS)))) -OTHERTAGS = +OTHERTAGS = libname = libpthread endif @@ -360,10 +360,10 @@ maintainer.; \ fi # ifeq ($(VERSIONING),yes) -# +# # # Adding this dependency gets it included in the command line, # # where ld will read it as a linker script. # $(libname).so.$(hurd-version): $(srcdir)/$(libname).map -# +# # endif endif diff --git a/pthread/pt-alloc.c b/pthread/pt-alloc.c index 21063d5..e34a043 100644 --- a/pthread/pt-alloc.c +++ b/pthread/pt-alloc.c @@ -28,7 +28,7 @@ /* This braindamage is necessary because the standard says that some of the threads functions "shall fail" if "No thread could be found corresponding to that specified by the given thread ID." */ - + /* Thread ID lookup table. */ struct __pthread **__pthread_threads; diff --git a/pthread/pt-create.c b/pthread/pt-create.c index c9e0730..e517087 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -185,7 +185,7 @@ __pthread_create_internal (struct __pthread **thread, else err = __pthread_sigstate (_pthread_self (), 0, 0, &sigset, 0); assert_perror (err); - + err = __pthread_sigstate (pthread, SIG_SETMASK, &sigset, 0, 1); assert_perror (err); diff --git a/sysdeps/generic/pt-attr-setstack.c b/sysdeps/generic/pt-attr-setstack.c index 360d27a..431d6a4 100644 --- a/sysdeps/generic/pt-attr-setstack.c +++ b/sysdeps/generic/pt-attr-setstack.c @@ -46,6 +46,6 @@ pthread_attr_setstack (pthread_attr_t *attr, return err; } - + return 0; } diff --git a/sysdeps/generic/pt-cond-signal.c b/sysdeps/generic/pt-cond-signal.c index 4b5450c..93f7ac7 100644 --- a/sysdeps/generic/pt-cond-signal.c +++ b/sysdeps/generic/pt-cond-signal.c @@ -27,7 +27,7 @@ int __pthread_cond_signal (pthread_cond_t *cond) { struct __pthread *wakeup; - + __pthread_spin_lock (&cond->__lock); wakeup = cond->__queue; if (wakeup) diff --git a/sysdeps/generic/pt-key.h b/sysdeps/generic/pt-key.h index 46830d7..759ab68 100644 --- a/sysdeps/generic/pt-key.h +++ b/sysdeps/generic/pt-key.h @@ -30,7 +30,7 @@ /* __PTHREAD_KEY_DESTRUCTORS is an array of destructors with __PTHREAD_KEY_SIZE elements. If an element with index less than __PTHREAD_KEY_COUNT is invalid, it shall contain the value - PTHREAD_KEY_INVALID which shall be distinct from NULL. + PTHREAD_KEY_INVALID which shall be distinct from NULL. Normally, we just add new keys to the end of the array and realloc it as necessary. The pthread_key_create routine may decide to diff --git a/sysdeps/generic/pt-rwlock-unlock.c b/sysdeps/generic/pt-rwlock-unlock.c index 0506ae6..b796508 100644 --- a/sysdeps/generic/pt-rwlock-unlock.c +++ b/sysdeps/generic/pt-rwlock-unlock.c @@ -28,7 +28,7 @@ int __pthread_rwlock_unlock (pthread_rwlock_t *rwlock) { struct __pthread *wakeup; - + __pthread_spin_lock (&rwlock->__lock); assert (__pthread_spin_trylock (&rwlock->__held) == EBUSY); @@ -44,7 +44,7 @@ __pthread_rwlock_unlock (pthread_rwlock_t *rwlock) if (rwlock->__readers == 1) /* Last reader. */ rwlock->__readers = 0; - + /* Wake someone else up. Try the writer queue first, then the reader queue if that is empty. */ diff --git a/sysdeps/mach/hurd/pt-docancel.c b/sysdeps/mach/hurd/pt-docancel.c index b3a5507..12bbafb 100644 --- a/sysdeps/mach/hurd/pt-docancel.c +++ b/sysdeps/mach/hurd/pt-docancel.c @@ -47,7 +47,7 @@ __pthread_do_cancel (struct __pthread *p) else { error_t err; - + err = __thread_suspend (p->kernel_thread); assert_perror (err); diff --git a/sysdeps/mach/hurd/pt-mutexattr-gettype.c b/sysdeps/mach/hurd/pt-mutexattr-gettype.c index 746f628..754cc04 100644 --- a/sysdeps/mach/hurd/pt-mutexattr-gettype.c +++ b/sysdeps/mach/hurd/pt-mutexattr-gettype.c @@ -28,4 +28,3 @@ int pthread_mutexattr_gettype (const pthread_mutexattr_t *attrp, int *outp) *outp = attrp->__mutex_type; return (0); } - diff --git a/sysdeps/mach/pt-wakeup.c b/sysdeps/mach/pt-wakeup.c index 95fdbf9..c2eb9ca 100644 --- a/sysdeps/mach/pt-wakeup.c +++ b/sysdeps/mach/pt-wakeup.c @@ -30,7 +30,7 @@ void __pthread_wakeup (struct __pthread *thread) { error_t err; - + err = __mach_msg (&thread->wakeupmsg, MACH_SEND_MSG | MACH_SEND_TIMEOUT, sizeof (thread->wakeupmsg), 0, MACH_PORT_NULL, 0 , MACH_PORT_NULL); diff --git a/sysdeps/pthread/bits/cancelation.h b/sysdeps/pthread/bits/cancelation.h index 1ed16c6..42c0a3a 100644 --- a/sysdeps/pthread/bits/cancelation.h +++ b/sysdeps/pthread/bits/cancelation.h @@ -41,7 +41,7 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); *__handlers \ }; \ *__handlers = &__handler; - + #define __pthread_cleanup_pop(execute) \ if (execute) \ __handler.__handler (__handler.__arg); \ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 3e44d6b..bdbfc19 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2000-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/sysdeps/pthread/pthread-functions.h b/sysdeps/pthread/pthread-functions.h index 0fc8968..db30f13 100644 --- a/sysdeps/pthread/pthread-functions.h +++ b/sysdeps/pthread/pthread-functions.h @@ -29,9 +29,9 @@ int __pthread_attr_setdetachstate (pthread_attr_t *, int); int __pthread_attr_getinheritsched (const pthread_attr_t *, int *); int __pthread_attr_setinheritsched (pthread_attr_t *, int); int __pthread_attr_getschedparam (const pthread_attr_t *, - struct sched_param *); + struct sched_param *); int __pthread_attr_setschedparam (pthread_attr_t *, - const struct sched_param *); + const struct sched_param *); int __pthread_attr_getschedpolicy (const pthread_attr_t *, int *); int __pthread_attr_setschedpolicy (pthread_attr_t *, int); int __pthread_attr_getscope (const pthread_attr_t *, int *); @@ -41,19 +41,19 @@ int __pthread_condattr_init (pthread_condattr_t *); int __pthread_cond_broadcast (pthread_cond_t *); int __pthread_cond_destroy (pthread_cond_t *); int __pthread_cond_init (pthread_cond_t *, - const pthread_condattr_t *); + const pthread_condattr_t *); int __pthread_cond_signal (pthread_cond_t *); int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *); int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *, - const struct timespec *); + const struct timespec *); int __pthread_equal (pthread_t, pthread_t); void __pthread_exit (void *); int __pthread_getschedparam (pthread_t, int *, struct sched_param *); int __pthread_setschedparam (pthread_t, int, - const struct sched_param *); + const struct sched_param *); int _pthread_mutex_destroy (pthread_mutex_t *); int _pthread_mutex_init (pthread_mutex_t *, - const pthread_mutexattr_t *); + const pthread_mutexattr_t *); int __pthread_mutex_lock (pthread_mutex_t *); int __pthread_mutex_trylock (pthread_mutex_t *); int __pthread_mutex_unlock (pthread_mutex_t *); diff --git a/tests/test-11.c b/tests/test-11.c index de779a4..f5a5aa0 100644 --- a/tests/test-11.c +++ b/tests/test-11.c @@ -109,11 +109,11 @@ main (int argc, char **argv) /* Read lock it. */ err = pthread_rwlock_tryrdlock (&lock); assert (err == 0); - + /* Try to write lock it. It should fail with EBUSY. */ err = pthread_rwlock_trywrlock (&lock); assert (err == EBUSY); - + /* Drop the read lock. */ err = pthread_rwlock_unlock (&lock); assert (err == 0); diff --git a/tests/test-6.c b/tests/test-6.c index edf2919..205c7a4 100644 --- a/tests/test-6.c +++ b/tests/test-6.c @@ -50,7 +50,7 @@ main (int argc, char **argv) error (1, err, "pthread_barrier_init"); for (j = 0; j < WAITS; j ++) - { + { for (i = 0; i < THREADS; i ++) { diff --git a/tests/test-7.c b/tests/test-7.c index 22fb1ca..be724ce 100644 --- a/tests/test-7.c +++ b/tests/test-7.c @@ -23,7 +23,7 @@ thr (void *arg) assert (pthread_getspecific (key[i]) == NULL); printf ("pthread_setspecific(%d, %d).\n", key[i], pthread_self ()); err = pthread_setspecific (key[i], (void *) pthread_self ()); - printf ("pthread_setspecific(%d, %d) => %d.\n", key[i], pthread_self (), err); + printf ("pthread_setspecific(%d, %d) => %d.\n", key[i], pthread_self (), err); assert_perror (err); } |