mirror of
https://https.git.savannah.gnu.org/git/coreutils.git
synced 2026-01-27 01:44:21 +00:00
Correct cpp indentation
This commit is contained in:
Jim Meyering
parent
2e71ba4dd2
commit
8ac343fffa
@ -1,3 +1,12 @@
|
||||
2005-05-14 Jim Meyering <jim@meyering.net>
|
||||
|
||||
* unlocked-io.h, gethrxtime.c, gethrxtime.h, mountlist.h,
|
||||
* xtime.h, path-concat.c: Correct cpp indentation.
|
||||
|
||||
2005-05-14 Jim Meyering <jim@meyering.net>
|
||||
|
||||
Update FSF postal mail address everywhere.
|
||||
|
||||
2005-05-09 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* fts_.h (FTS): Use correct type for fts_compar member.
|
||||
|
||||
@ -58,7 +58,7 @@ gethrxtime (void)
|
||||
}
|
||||
# endif
|
||||
|
||||
#if HAVE_MICROUPTIME
|
||||
# if HAVE_MICROUPTIME
|
||||
{
|
||||
struct timeval tv;
|
||||
microuptime (&tv);
|
||||
|
||||
@ -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 <time.h>
|
||||
# if HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME
|
||||
# include <time.h>
|
||||
static inline xtime_t gethrxtime (void) { return gethrtime (); }
|
||||
#else
|
||||
# else
|
||||
xtime_t gethrxtime (void);
|
||||
#endif
|
||||
# endif
|
||||
|
||||
#endif
|
||||
|
||||
@ -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 <stdbool.h>
|
||||
#include <sys/types.h>
|
||||
# include <stdbool.h>
|
||||
# include <sys/types.h>
|
||||
|
||||
/* A mount table entry. */
|
||||
struct mount_entry
|
||||
|
||||
@ -89,8 +89,8 @@ path_concat (char const *dir, char const *abase, char **base_in_result)
|
||||
}
|
||||
|
||||
#ifdef TEST_PATH_CONCAT
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
# include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
@ -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 <stdio.h>
|
||||
# include <stdio.h>
|
||||
|
||||
#if HAVE_DECL_CLEARERR_UNLOCKED
|
||||
# undef clearerr
|
||||
# define clearerr(x) clearerr_unlocked (x)
|
||||
#else
|
||||
# define clearerr_unlocked(x) clearerr (x)
|
||||
#endif
|
||||
# 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_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_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_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_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_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_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_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_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_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_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_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
|
||||
# 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 flockfile
|
||||
# define flockfile(x) ((void) 0)
|
||||
|
||||
#undef ftrylockfile
|
||||
#define ftrylockfile(x) 0
|
||||
# undef ftrylockfile
|
||||
# define ftrylockfile(x) 0
|
||||
|
||||
#undef funlockfile
|
||||
#define funlockfile(x) ((void) 0)
|
||||
# undef funlockfile
|
||||
# define funlockfile(x) ((void) 0)
|
||||
|
||||
#endif /* UNLOCKED_IO_H */
|
||||
|
||||
20
lib/xtime.h
20
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 <limits.h>
|
||||
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 <limits.h>
|
||||
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. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user