From: Jim Meyering Date: Sat, 14 May 2005 08:03:44 +0000 (+0000) Subject: Correct cpp indentation X-Git-Tag: CPPI-1_12~794 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac343fffac0f5ead2098fd938812725a511f03b;p=thirdparty%2Fcoreutils.git Correct cpp indentation --- diff --git a/lib/ChangeLog b/lib/ChangeLog index 97b0c47022..97cba8d4b2 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,12 @@ +2005-05-14 Jim Meyering + + * unlocked-io.h, gethrxtime.c, gethrxtime.h, mountlist.h, + * xtime.h, path-concat.c: Correct cpp indentation. + +2005-05-14 Jim Meyering + + Update FSF postal mail address everywhere. + 2005-05-09 Paul Eggert * fts_.h (FTS): Use correct type for fts_compar member. diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c index a316314d83..2c985789dc 100644 --- a/lib/gethrxtime.c +++ b/lib/gethrxtime.c @@ -58,7 +58,7 @@ gethrxtime (void) } # endif -#if HAVE_MICROUPTIME +# if HAVE_MICROUPTIME { struct timeval tv; microuptime (&tv); diff --git a/lib/gethrxtime.h b/lib/gethrxtime.h index 4de3a9b3ef..ecbd505d50 100644 --- a/lib/gethrxtime.h +++ b/lib/gethrxtime.h @@ -19,19 +19,19 @@ /* Written by Paul Eggert. */ #ifndef GETHRXTIME_H_ -#define GETHRXTIME_H_ 1 +# define GETHRXTIME_H_ 1 -#include "xtime.h" +# include "xtime.h" /* Get the current time, as a count of the number of nanoseconds since an arbitrary epoch (e.g., the system boot time). This clock can't be set, is always increasing, and is nearly linear. */ -#if HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME -# include +# if HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME +# include static inline xtime_t gethrxtime (void) { return gethrtime (); } -#else +# else xtime_t gethrxtime (void); -#endif +# endif #endif diff --git a/lib/mountlist.h b/lib/mountlist.h index 48d04341ba..cacfe45cd5 100644 --- a/lib/mountlist.h +++ b/lib/mountlist.h @@ -18,10 +18,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef MOUNTLIST_H_ -#define MOUNTLIST_H_ +# define MOUNTLIST_H_ -#include -#include +# include +# include /* A mount table entry. */ struct mount_entry diff --git a/lib/path-concat.c b/lib/path-concat.c index 1643aa99af..364081f157 100644 --- a/lib/path-concat.c +++ b/lib/path-concat.c @@ -89,8 +89,8 @@ path_concat (char const *dir, char const *abase, char **base_in_result) } #ifdef TEST_PATH_CONCAT -#include -#include +# include +# include int main () { diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index 816ed3de5f..d00930361c 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -19,7 +19,7 @@ /* Written by Jim Meyering. */ #ifndef UNLOCKED_IO_H -#define UNLOCKED_IO_H 1 +# define UNLOCKED_IO_H 1 /* These are wrappers for functions/macros from the GNU C library, and from other C libraries supporting POSIX's optional thread-safe functions. @@ -32,106 +32,106 @@ the *_unlocked functions directly. On hosts that lack those functions, invoke the non-thread-safe versions instead. */ -#include - -#if HAVE_DECL_CLEARERR_UNLOCKED -# undef clearerr -# define clearerr(x) clearerr_unlocked (x) -#else -# define clearerr_unlocked(x) clearerr (x) -#endif - -#if HAVE_DECL_FEOF_UNLOCKED -# undef feof -# define feof(x) feof_unlocked (x) -#else -# define feof_unlocked(x) feof (x) -#endif - -#if HAVE_DECL_FERROR_UNLOCKED -# undef ferror -# define ferror(x) ferror_unlocked (x) -#else -# define ferror_unlocked(x) ferror (x) -#endif - -#if HAVE_DECL_FFLUSH_UNLOCKED -# undef fflush -# define fflush(x) fflush_unlocked (x) -#else -# define fflush_unlocked(x) fflush (x) -#endif - -#if HAVE_DECL_FGETS_UNLOCKED -# undef fgets -# define fgets(x,y,z) fgets_unlocked (x,y,z) -#else -# define fgets_unlocked(x,y,z) fgets (x,y,z) -#endif - -#if HAVE_DECL_FPUTC_UNLOCKED -# undef fputc -# define fputc(x,y) fputc_unlocked (x,y) -#else -# define fputc_unlocked(x,y) fputc (x,y) -#endif - -#if HAVE_DECL_FPUTS_UNLOCKED -# undef fputs -# define fputs(x,y) fputs_unlocked (x,y) -#else -# define fputs_unlocked(x,y) fputs (x,y) -#endif - -#if HAVE_DECL_FREAD_UNLOCKED -# undef fread -# define fread(w,x,y,z) fread_unlocked (w,x,y,z) -#else -# define fread_unlocked(w,x,y,z) fread (w,x,y,z) -#endif - -#if HAVE_DECL_FWRITE_UNLOCKED -# undef fwrite -# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z) -#else -# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) -#endif - -#if HAVE_DECL_GETC_UNLOCKED -# undef getc -# define getc(x) getc_unlocked (x) -#else -# define getc_unlocked(x) getc (x) -#endif - -#if HAVE_DECL_GETCHAR_UNLOCKED -# undef getchar -# define getchar() getchar_unlocked () -#else -# define getchar_unlocked() getchar () -#endif - -#if HAVE_DECL_PUTC_UNLOCKED -# undef putc -# define putc(x,y) putc_unlocked (x,y) -#else -# define putc_unlocked(x,y) putc (x,y) -#endif - -#if HAVE_DECL_PUTCHAR_UNLOCKED -# undef putchar -# define putchar(x) putchar_unlocked (x) -#else -# define putchar_unlocked(x) putchar (x) -#endif - -#undef flockfile -#define flockfile(x) ((void) 0) - -#undef ftrylockfile -#define ftrylockfile(x) 0 - -#undef funlockfile -#define funlockfile(x) ((void) 0) +# include + +# if HAVE_DECL_CLEARERR_UNLOCKED +# undef clearerr +# define clearerr(x) clearerr_unlocked (x) +# else +# define clearerr_unlocked(x) clearerr (x) +# endif + +# if HAVE_DECL_FEOF_UNLOCKED +# undef feof +# define feof(x) feof_unlocked (x) +# else +# define feof_unlocked(x) feof (x) +# endif + +# if HAVE_DECL_FERROR_UNLOCKED +# undef ferror +# define ferror(x) ferror_unlocked (x) +# else +# define ferror_unlocked(x) ferror (x) +# endif + +# if HAVE_DECL_FFLUSH_UNLOCKED +# undef fflush +# define fflush(x) fflush_unlocked (x) +# else +# define fflush_unlocked(x) fflush (x) +# endif + +# if HAVE_DECL_FGETS_UNLOCKED +# undef fgets +# define fgets(x,y,z) fgets_unlocked (x,y,z) +# else +# define fgets_unlocked(x,y,z) fgets (x,y,z) +# endif + +# if HAVE_DECL_FPUTC_UNLOCKED +# undef fputc +# define fputc(x,y) fputc_unlocked (x,y) +# else +# define fputc_unlocked(x,y) fputc (x,y) +# endif + +# if HAVE_DECL_FPUTS_UNLOCKED +# undef fputs +# define fputs(x,y) fputs_unlocked (x,y) +# else +# define fputs_unlocked(x,y) fputs (x,y) +# endif + +# if HAVE_DECL_FREAD_UNLOCKED +# undef fread +# define fread(w,x,y,z) fread_unlocked (w,x,y,z) +# else +# define fread_unlocked(w,x,y,z) fread (w,x,y,z) +# endif + +# if HAVE_DECL_FWRITE_UNLOCKED +# undef fwrite +# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z) +# else +# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) +# endif + +# if HAVE_DECL_GETC_UNLOCKED +# undef getc +# define getc(x) getc_unlocked (x) +# else +# define getc_unlocked(x) getc (x) +# endif + +# if HAVE_DECL_GETCHAR_UNLOCKED +# undef getchar +# define getchar() getchar_unlocked () +# else +# define getchar_unlocked() getchar () +# endif + +# if HAVE_DECL_PUTC_UNLOCKED +# undef putc +# define putc(x,y) putc_unlocked (x,y) +# else +# define putc_unlocked(x,y) putc (x,y) +# endif + +# if HAVE_DECL_PUTCHAR_UNLOCKED +# undef putchar +# define putchar(x) putchar_unlocked (x) +# else +# define putchar_unlocked(x) putchar (x) +# endif + +# undef flockfile +# define flockfile(x) ((void) 0) + +# undef ftrylockfile +# define ftrylockfile(x) 0 + +# undef funlockfile +# define funlockfile(x) ((void) 0) #endif /* UNLOCKED_IO_H */ diff --git a/lib/xtime.h b/lib/xtime.h index 8da1f20f9e..1d5f70b0d8 100644 --- a/lib/xtime.h +++ b/lib/xtime.h @@ -19,24 +19,24 @@ /* Written by Paul Eggert. */ #ifndef XTIME_H_ -#define XTIME_H_ 1 +# define XTIME_H_ 1 /* xtime_t is a signed type used for time stamps. It is an integer type that is a count of nanoseconds -- except for obsolescent hosts without sufficiently-wide integers, where it is a count of seconds. */ -#if HAVE_LONG_LONG +# if HAVE_LONG_LONG typedef long long int xtime_t; -# define XTIME_PRECISION 1000000000LL -#else -# include -typedef long int xtime_t; -# if LONG_MAX >> 31 >> 31 == 0 -# define XTIME_PRECISION 1L +# define XTIME_PRECISION 1000000000LL # else -# define XTIME_PRECISION 1000000000L +# include +typedef long int xtime_t; +# if LONG_MAX >> 31 >> 31 == 0 +# define XTIME_PRECISION 1L +# else +# define XTIME_PRECISION 1000000000L +# endif # endif -#endif /* Return an extended time value that contains S seconds and NS nanoseconds, without any overflow checking. */