diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | lib/fbufmode.c | 2 | ||||
| -rw-r--r-- | lib/fpurge.c | 2 | ||||
| -rw-r--r-- | lib/freadable.c | 2 | ||||
| -rw-r--r-- | lib/freading.c | 30 | ||||
| -rw-r--r-- | lib/fwritable.c | 2 | ||||
| -rw-r--r-- | lib/fwriting.c | 2 | ||||
| -rw-r--r-- | lib/sigaction.c | 4 |
9 files changed, 36 insertions, 23 deletions
@@ -1,3 +1,15 @@ +2011-02-22 Eric Blake <eblake@redhat.com> + + maint: adjust cpp indentation for my modules, as well + * Makefile (sc_cpp_indent_check): Add my name. + * lib/fbufmode.c: Filter through cppi. + * lib/fpurge.c: Likewise. + * lib/freadable.c: Likewise. + * lib/freading.c: Likewise. + * lib/fwritable.c: Likewise. + * lib/fwriting.c: Likewise. + * lib/sigaction.c: Likewise. + 2011-02-22 Jim Meyering <meyering@redhat.com> maint: adjust cpp indentation to reflect nesting depth @@ -48,7 +48,8 @@ sc_pragma_columns: # Verify that certain (for now, only Jim Meyering's) lib/**.c files # are consistently cpp indented. sc_cpp_indent_check: - ./gnulib-tool --extract-filelist $$(cd modules; grep -ilr meyering .) \ + ./gnulib-tool --extract-filelist \ + $$(cd modules; grep -ilrE '(meyering|blake)' .) \ | sort -u \ | grep 'lib/.*\.c$$' \ | grep -v '/getloadavg\.c$$' \ diff --git a/lib/fbufmode.c b/lib/fbufmode.c index 7b4100e41c..01b0881f75 100644 --- a/lib/fbufmode.c +++ b/lib/fbufmode.c @@ -78,6 +78,6 @@ fbufmode (FILE *fp) return _IOLBF; return (fp->__bufsize > 0 ? _IOFBF : _IONBF); #else - #error "Please port gnulib fbufmode.c to your platform! Look at the setvbuf implementation." +# error "Please port gnulib fbufmode.c to your platform! Look at the setvbuf implementation." #endif } diff --git a/lib/fpurge.c b/lib/fpurge.c index 93ebfb079e..7e69fb4081 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -130,7 +130,7 @@ fpurge (FILE *fp) fp->__put_limit = fp->__buffer; return 0; # else - #error "Please port gnulib fpurge.c to your platform! Look at the definitions of fflush, setvbuf and ungetc on your system, then report this to bug-gnulib." +# error "Please port gnulib fpurge.c to your platform! Look at the definitions of fflush, setvbuf and ungetc on your system, then report this to bug-gnulib." # endif #endif diff --git a/lib/freadable.c b/lib/freadable.c index e1420f07bf..065eb3f001 100644 --- a/lib/freadable.c +++ b/lib/freadable.c @@ -40,6 +40,6 @@ freadable (FILE *fp) #elif defined __MINT__ /* Atari FreeMiNT */ return fp->__mode.__read; #else - #error "Please port gnulib freadable.c to your platform! Look at the definition of fopen, fdopen on your system, then report this to bug-gnulib." +# error "Please port gnulib freadable.c to your platform! Look at the definition of fopen, fdopen on your system, then report this to bug-gnulib." #endif } diff --git a/lib/freading.c b/lib/freading.c index 2f2babfaa7..51aed0e9b2 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -31,38 +31,38 @@ freading (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ return (fp_->_flags & __SRD) != 0; -#elif defined __EMX__ /* emx+gcc */ +# elif defined __EMX__ /* emx+gcc */ return (fp->_flags & _IOREAD) != 0; -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -# if defined __sun /* Solaris */ +# elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ +# if defined __sun /* Solaris */ return (fp->_flag & _IOREAD) != 0 && (fp->_flag & _IOWRT) == 0; -# else +# else return (fp->_flag & _IOREAD) != 0; -# endif -#elif defined __UCLIBC__ /* uClibc */ +# endif +# elif defined __UCLIBC__ /* uClibc */ return (fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) != 0; -#elif defined __QNX__ /* QNX */ +# elif defined __QNX__ /* QNX */ return ((fp->_Mode & 0x2 /* _MOPENW */) == 0 || (fp->_Mode & 0x1000 /* _MREAD */) != 0); -#elif defined __MINT__ /* Atari FreeMiNT */ +# elif defined __MINT__ /* Atari FreeMiNT */ if (!fp->__mode.__write) return 1; if (!fp->__mode.__read) return 0; -# ifdef _IO_CURRENTLY_GETTING /* Flag added on 2009-02-28 */ +# ifdef _IO_CURRENTLY_GETTING /* Flag added on 2009-02-28 */ return (fp->__flags & _IO_CURRENTLY_GETTING) != 0; -# else +# else return (fp->__buffer < fp->__get_limit /*|| fp->__bufp == fp->__put_limit ??*/); +# endif +# else +# error "Please port gnulib freading.c to your platform!" # endif -#else - #error "Please port gnulib freading.c to your platform!" -#endif } #endif diff --git a/lib/fwritable.c b/lib/fwritable.c index fdda290f10..04bc97c5b9 100644 --- a/lib/fwritable.c +++ b/lib/fwritable.c @@ -40,6 +40,6 @@ fwritable (FILE *fp) #elif defined __MINT__ /* Atari FreeMiNT */ return fp->__mode.__write; #else - #error "Please port gnulib fwritable.c to your platform! Look at the definition of fopen, fdopen on your system, then report this to bug-gnulib." +# error "Please port gnulib fwritable.c to your platform! Look at the definition of fopen, fdopen on your system, then report this to bug-gnulib." #endif } diff --git a/lib/fwriting.c b/lib/fwriting.c index a8078dfc31..fd40f51118 100644 --- a/lib/fwriting.c +++ b/lib/fwriting.c @@ -51,6 +51,6 @@ fwriting (FILE *fp) return (fp->__buffer < fp->__put_limit /*|| fp->__bufp == fp->__get_limit ??*/); # endif #else - #error "Please port gnulib fwriting.c to your platform!" +# error "Please port gnulib fwriting.c to your platform!" #endif } diff --git a/lib/sigaction.c b/lib/sigaction.c index 298895b56c..e6a55da864 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -142,10 +142,10 @@ sigaction (int sig, const struct sigaction *restrict act, return -1; } - #ifdef SIGABRT_COMPAT +#ifdef SIGABRT_COMPAT if (sig == SIGABRT_COMPAT) sig = SIGABRT; - #endif +#endif /* POSIX requires sigaction() to be async-signal-safe. In other words, if an asynchronous signal can occur while we are anywhere |