diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/exclude.c | 14 | ||||
| -rw-r--r-- | lib/pthread.in.h | 6 | ||||
| -rw-r--r-- | lib/pwrite.c | 2 | ||||
| -rw-r--r-- | lib/sys_time.in.h | 2 | ||||
| -rw-r--r-- | lib/unistr/u8-chr.c | 6 | ||||
| -rw-r--r-- | lib/unistr/u8-strchr.c | 12 |
7 files changed, 26 insertions, 21 deletions
@@ -1,3 +1,8 @@ +2010-07-28 Bruno Haible <bruno@clisp.org> + + Use spaces for indentation, not tabs. + * lib/**/*.[hcy] except lib/reg*.[hc]: Untabify. + 2010-07-27 Bruno Haible <bruno@clisp.org> mbspcasecmp: Fix function specification. diff --git a/lib/exclude.c b/lib/exclude.c index a68f3cbef4..7b71c12421 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -142,14 +142,14 @@ unescape_pattern (char *str) do { if (inset) - { - if (*q == ']') - inset = 0; - } + { + if (*q == ']') + inset = 0; + } else if (*q == '[') - inset = 1; + inset = 1; else if (*q == '\\') - q++; + q++; } while ((*str++ = *q++)); } @@ -501,7 +501,7 @@ add_exclude (struct exclude *ex, char const *pattern, int options) str = xstrdup (pattern); if (options & EXCLUDE_WILDCARDS) - unescape_pattern (str); + unescape_pattern (str); p = hash_insert (seg->v.table, str); if (p != str) free (str); diff --git a/lib/pthread.in.h b/lib/pthread.in.h index bb201a27c9..4dad22a27a 100644 --- a/lib/pthread.in.h +++ b/lib/pthread.in.h @@ -100,7 +100,7 @@ pthread_cond_destroy (pthread_cond_t *cond) static inline int pthread_cond_init (pthread_cond_t *restrict cond, - pthread_condattr_t const *restrict attr) + pthread_condattr_t const *restrict attr) { /* COND is never seriously used. */ return 0; @@ -115,7 +115,7 @@ pthread_cond_signal (pthread_cond_t *cond) static inline int pthread_cond_wait (pthread_cond_t *restrict cond, - pthread_mutex_t *restrict mutex) + pthread_mutex_t *restrict mutex) { /* Properly-written applications never come here. */ abort (); @@ -155,7 +155,7 @@ pthread_mutex_destroy (pthread_mutex_t *mutex) static inline int pthread_mutex_init (pthread_mutex_t *restrict mutex, - pthread_mutexattr_t const *restrict attr) + pthread_mutexattr_t const *restrict attr) { /* MUTEX is never seriously used. */ return 0; diff --git a/lib/pwrite.c b/lib/pwrite.c index acf6acf92b..00714791c3 100644 --- a/lib/pwrite.c +++ b/lib/pwrite.c @@ -55,7 +55,7 @@ pwrite (int fd, const void *buf, size_t nbyte, off_t offset) if (__libc_lseek (fd, old_offset, SEEK_SET) == (off_t) -1) { if (result == -1) - __set_errno (save_errno); + __set_errno (save_errno); return -1; } __set_errno (save_errno); diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 6e0c7db984..ba42e8da93 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -88,7 +88,7 @@ _GL_CXXALIASWARN (gettimeofday); # undef gettimeofday # if HAVE_RAW_DECL_GETTIMEOFDAY _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " - "use gnulib module gettimeofday for portability"); + "use gnulib module gettimeofday for portability"); # endif # endif diff --git a/lib/unistr/u8-chr.c b/lib/unistr/u8-chr.c index 46a3bd2057..25b7a3ebeb 100644 --- a/lib/unistr/u8-chr.c +++ b/lib/unistr/u8-chr.c @@ -95,9 +95,9 @@ u8_chr (const uint8_t *s, size_t n, ucs4_t uc) uint8_t c1 = c[1]; uint8_t c2 = c[2]; const uint8_t *end = s + n - 2; - size_t skip; + size_t skip; - if (c2 == c1) + if (c2 == c1) skip = 1; else skip = 3; @@ -134,7 +134,7 @@ u8_chr (const uint8_t *s, size_t n, ucs4_t uc) const uint8_t *end = s + n - 3; size_t skip; - if (c3 == c2) + if (c3 == c2) skip = 1; else if (c3 == c1) skip = 2; diff --git a/lib/unistr/u8-strchr.c b/lib/unistr/u8-strchr.c index 8ff49ef213..03d6138adc 100644 --- a/lib/unistr/u8-strchr.c +++ b/lib/unistr/u8-strchr.c @@ -35,12 +35,12 @@ u8_strchr (const uint8_t *s, ucs4_t uc) if (false) { /* Unoptimized code. */ - for (;;) + for (;;) { uint8_t s0 = *s; if (s0 == c0) - return (uint8_t *) s; - s++; + return (uint8_t *) s; + s++; if (s0 == 0) break; } @@ -56,9 +56,9 @@ u8_strchr (const uint8_t *s, ucs4_t uc) else /* Loops equivalent to strstr, optimized for a specific length (2, 3, 4) of the needle. We use an algorithm similar to Boyer-Moore which - is documented in lib/unistr/u8-chr.c. There is additional - complication because we need to check after every byte for - a NUL byte, but the idea is the same. */ + is documented in lib/unistr/u8-chr.c. There is additional + complication because we need to check after every byte for + a NUL byte, but the idea is the same. */ switch (u8_uctomb_aux (c, uc, 6)) { case 2: |