indent cpp-directives

diff --git a/lib/basename.c b/lib/basename.c
index 5c619c96f93832a971fa2eb187554382f5499d5a..f1a7266ad6776859eac2785da41d8ef8e948ad39 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -16,7 +16,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /* Return NAME with any leading path stripped off.

diff --git a/lib/canon-host.c b/lib/canon-host.c
index 0096aca291595e67df1fa8acf429a040a70169b8..161fdb34f926535b734249aa96b6003baa8d2caf 100644 (file)
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -19,27 +19,27 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
+# include <sys/socket.h>
 #endif
 
 #ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
 #endif
 
 /* Returns the canonical hostname associated with HOST (allocated in a static
@@ -53,24 +53,24 @@ canon_host (host)
 
   if (he)
     {
-#ifdef HAVE_GETHOSTBYADDR
+# ifdef HAVE_GETHOSTBYADDR
       char *addr = 0;
 
       /* Try and get an ascii version of the numeric host address.  */
       switch (he->h_addrtype)
        {
-#ifdef HAVE_INET_NTOA
+#  ifdef HAVE_INET_NTOA
        case AF_INET:
          addr = inet_ntoa (*(struct in_addr *) he->h_addr);
          break;
-#endif /* HAVE_INET_NTOA */
+#  endif /* HAVE_INET_NTOA */
        }
 
       if (addr && strcmp (he->h_name, addr) == 0)
        /* gethostbyname() cheated!  Lookup the host name via the address
           this time to get the actual host name.  */
        he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
-#endif /* HAVE_GETHOSTBYADDR */
+# endif /* HAVE_GETHOSTBYADDR */
 
       if (he)
        return (char *) (he->h_name);

diff --git a/lib/error.h b/lib/error.h
index 3439f37b2448da7b8cf89c69f1f41a13e070cceb..d0dfda94fd299b4e4a02803aff9f05291476d19e 100644 (file)
--- a/lib/error.h
+++ b/lib/error.h
@@ -16,22 +16,22 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _error_h_
-#define _error_h_
+# define _error_h_
 
-#ifndef __attribute__
+# ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  define __attribute__(Spec) /* empty */
-# endif
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#   define __attribute__(Spec) /* empty */
+#  endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#   define __format__ format
+#   define __printf__ printf
+#  endif
 # endif
-#endif
 
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
 
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
@@ -49,11 +49,11 @@ extern void error_at_line (int status, int errnum, const char *fname,
    function without parameters instead.  */
 extern void (*error_print_progname) (void);
 
-#else
+# else
 void error ();
 void error_at_line ();
 extern void (*error_print_progname) ();
-#endif
+# endif
 
 /* This variable is incremented each time `error' is called.  */
 extern unsigned int error_message_count;

diff --git a/lib/gethostname.c b/lib/gethostname.c
index e37e72189bd3943240f5167b00698d3cf6535d1c..3d66dc936052dd3229845f9732b6fed94c401add 100644 (file)
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -18,11 +18,11 @@
 /* David MacKenzie <djm@gnu.ai.mit.edu> */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef HAVE_UNAME
-#include <sys/utsname.h>
+# include <sys/utsname.h>
 #endif
 
 /* Put up to LEN chars of the host name into NAME.

diff --git a/lib/getline.c b/lib/getline.c
index 3a1366561dceca49dc04c8254f3d5956e6e6bb87..ba05abb73affe0a6bb812309b28beee73145ff65 100644 (file)
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -42,17 +42,17 @@ getline (lineptr, n, stream)
 
 #else /* ! have getdelim */
 
-#define NDEBUG
-#include <assert.h>
+# define NDEBUG
+# include <assert.h>
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
+# if STDC_HEADERS
+#  include <stdlib.h>
+# else
 char *malloc (), *realloc ();
-#endif
+# endif
 
 /* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
+# define MIN_CHUNK 64
 
 /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
    + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from

diff --git a/lib/getline.h b/lib/getline.h
index b22136d1e687e0e28d42da50d7ebc876f66a167d..f0bdf0f82d3f1090c848731ded500fc1f22926a9 100644 (file)
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -15,17 +15,17 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _getline_h_
-#define _getline_h_ 1
+# define _getline_h_ 1
 
-#include <stdio.h>
+# include <stdio.h>
 
-#ifndef PARAMS
-# if defined (__GNUC__) || __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif  /* GCC.  */
-#endif  /* Not PARAMS.  */
+# ifndef PARAMS
+#  if defined (__GNUC__) || __STDC__
+#   define PARAMS(args) args
+#  else
+#   define PARAMS(args) ()
+#  endif  /* GCC.  */
+# endif  /* Not PARAMS.  */
 
 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));

diff --git a/lib/getugroups.c b/lib/getugroups.c
index c80207161c9b468c0fd9c0b447129e2d1e37d52a..6c818f110856553a559b8579cec4e32afa7eb5fc 100644 (file)
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -18,7 +18,7 @@
 /* Written by David MacKenzie. */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <sys/types.h>
@@ -26,7 +26,7 @@
 #include <grp.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 /* setgrent, getgrent, and endgrent are not specified by POSIX.1,
@@ -36,9 +36,9 @@
 struct group *getgrent ();
 
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif
 
 /* Like `getgroups', but for user USERNAME instead of for

diff --git a/lib/getusershell.c b/lib/getusershell.c
index f11bde61dffe86bef9b5242e5adf3d1deab95628..dfed7a6c41678e6d98149bec8c518437722cf52d 100644 (file)
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -18,19 +18,19 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifndef SHELLS_FILE
 /* File containing a list of nonrestricted shells, one per line. */
-#define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
 #endif
 
 #include <stdio.h>
 #include <ctype.h>
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 char *malloc ();
 char *realloc ();

diff --git a/lib/group-member.c b/lib/group-member.c
index eda707321c9d6fcd3d2fb9aeb5359b52801e91b5..9a079e29363b62d6f2079e24209cc3c404dbe471 100644 (file)
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -16,18 +16,18 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <stdio.h>
 #include <sys/types.h>
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #include "group-member.h"

diff --git a/lib/group-member.h b/lib/group-member.h
index 407e85ea092d091185d952365c99080a5f7e5e8b..813b1a3c9b0ced559a4d6766a10e85ccfb6ec59c 100644 (file)
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -1,5 +1,5 @@
 #ifndef _group_member_h_
-#define _group_member_h_ 1
+# define _group_member_h_ 1
 
 int
   group_member ();

diff --git a/lib/modechange.h b/lib/modechange.h
index eaf854e15bcaf62a78662356cbf57a44beec690b..ab6eb9634e1328d37cb26eb7b97f2bf80d9d55aa 100644 (file)
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -45,11 +45,11 @@ struct mode_change
 #define MODE_MEMORY_EXHAUSTED (struct mode_change *) 1
 
 #ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif  /* GCC.  */
+# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif  /* GCC.  */
 #endif  /* Not __P.  */
 
 struct mode_change *mode_compile __P ((const char *, unsigned));

diff --git a/lib/putenv.c b/lib/putenv.c
index a7060506c974631e48b2d7cc1cfada361c095782..ee3ccc04a7017900671d434849c6562a1faa80b0 100644 (file)
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -21,7 +21,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /* Define-away any (possibly conflicting) prototype of putenv.
@@ -29,26 +29,26 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define putenv _sys_putenv
 
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #endif
 #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #undef putenv
 
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
-#define strchr index
+# define strchr index
 #endif
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
-#define memcpy(d,s,n) bcopy ((s), (d), (n))
+# define memcpy(d,s,n) bcopy ((s), (d), (n))
 #endif
 
 #if HAVE_GNU_LD
-#define environ __environ
+# define environ __environ
 #else
 extern char **environ;
 #endif

diff --git a/lib/readtokens.c b/lib/readtokens.c
index ccd8f4b653a871a20dadb6eacbbc2fee342bdea5..651b5efb651602f1976af7b4b37f21481d127ba9 100644 (file)
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -28,23 +28,23 @@
    */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <stdio.h>
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
 #if defined (STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 /* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-#if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
-#include <memory.h>
-#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
+# if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
+#  include <memory.h>
+# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 #else /* not STDC_HEADERS and not HAVE_STRING_H */
-#include <strings.h>
+# include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 

diff --git a/lib/readtokens.h b/lib/readtokens.h
index b35cf6e33a6f2b3b6ec7776b9db89ef269aa75b5..a2e0b9d73aca86e1070ae8b8bd774b39861f217e 100644 (file)
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,12 +1,12 @@
 #ifndef H_READTOKENS_H
-#define H_READTOKENS_H
+# define H_READTOKENS_H
 
-#ifndef INITIAL_TOKEN_LENGTH
-#define INITIAL_TOKEN_LENGTH 20
-#endif
+# ifndef INITIAL_TOKEN_LENGTH
+#  define INITIAL_TOKEN_LENGTH 20
+# endif
 
-#ifndef TOKENBUFFER_DEFINED
-#define TOKENBUFFER_DEFINED
+# ifndef TOKENBUFFER_DEFINED
+#  define TOKENBUFFER_DEFINED
 struct tokenbuffer
 {
   long size;
@@ -14,14 +14,14 @@ struct tokenbuffer
 };
 typedef struct tokenbuffer token_buffer;
 
-#endif /* not TOKENBUFFER_DEFINED */
+# endif /* not TOKENBUFFER_DEFINED */
 
-#undef __P
-#if defined (__STDC__) && __STDC__
-#define        __P(x) x
-#else
-#define        __P(x) ()
-#endif
+# undef __P
+# if defined (__STDC__) && __STDC__
+#  define      __P(x) x
+# else
+#  define      __P(x) ()
+# endif
 
 void init_tokenbuffer __P ((token_buffer *tokenbuffer));
 

diff --git a/lib/setenv.c b/lib/setenv.c
index b24cecce537180e1ab0ec3374f22471982092c2a..429f5f8fe88442b27d6a2592b1d178b29be18076 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -19,23 +19,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <errno.h>
 
 #if _LIBC || HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 #if _LIBC || HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #if _LIBC || HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #ifndef        HAVE_GNU_LD
-#define        __environ       environ
+# define       __environ       environ
 #endif
 
 int

diff --git a/lib/setenv.h b/lib/setenv.h
index 932a852d79d437b845a953c8dd9d3f224ae70150..54d7963c1d0dff6b37b27410b2958497f3e03315 100644 (file)
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -1,12 +1,12 @@
 #ifndef SETENV_H
-#define SETENV_H 1
+# define SETENV_H 1
 
-#undef __P
-#if defined (__STDC__) && __STDC__
-#define        __P(x) x
-#else
-#define        __P(x) ()
-#endif
+# undef __P
+# if defined (__STDC__) && __STDC__
+#  define      __P(x) x
+# else
+#  define      __P(x) ()
+# endif
 
 int
   setenv __P ((const char *name, const char *value, int replace));

diff --git a/lib/stime.c b/lib/stime.c
index 1756110e3317fd8f1fa69c58b0c8ae9c8bff85f6..5a8255b83a00e5860910d6a73c1b86c72f72b5ba 100644 (file)
--- a/lib/stime.c
+++ b/lib/stime.c
@@ -18,7 +18,7 @@
 /* David MacKenzie <djm@ai.mit.edu> */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <sys/types.h>

diff --git a/lib/strcspn.c b/lib/strcspn.c
index d174330d9ce5158ed39d66d67965c3b39656fae8..1e14c3779d1861f96122f926637854d5d38ad90f 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -15,16 +15,16 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
-#ifndef strchr
-#define strchr index
-#endif
+# include <strings.h>
+# ifndef strchr
+#  define strchr index
+# endif
 #endif
 
 /* Return the length of the maximum inital segment of S

diff --git a/lib/strftime.c b/lib/strftime.c
index 16a9bb2b44967c741a66d6ddac795a6558ca3f75..89ce661366891020964c58baf5cdc3c81f189a91 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -62,19 +62,19 @@ USA.  */
 #endif
 
 #ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif  /* GCC.  */
+# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif  /* GCC.  */
 #endif  /* Not __P.  */
 
 #ifndef PTR
-#ifdef __STDC__
-#define PTR void *
-#else
-#define PTR char *
-#endif
+# ifdef __STDC__
+#  define PTR void *
+# else
+#  define PTR char *
+# endif
 #endif
 
 static unsigned int week __P((const struct tm *const, int, int));
@@ -96,9 +96,9 @@ static unsigned int week __P((const struct tm *const, int, int));
 #define        cpy(n, s)       add((n), memcpy((PTR) p, (PTR) (s), (n)))
 
 #ifdef _LIBC
-#define        fmt(n, args)    add((n), if (sprintf args != (n)) return 0)
+# define       fmt(n, args)    add((n), if (sprintf args != (n)) return 0)
 #else
-#define        fmt(n, args)    add((n), sprintf args; if (strlen (p) != (n)) return 0)
+# define       fmt(n, args)    add((n), sprintf args; if (strlen (p) != (n)) return 0)
 #endif
 
 

diff --git a/lib/strtol.c b/lib/strtol.c
index b2336a197152241a0f10950630e35681462112c0..ad0804931d9318f5e2d80ecba8194c3c6ed4b00a 100644 (file)
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -108,12 +108,12 @@ extern int errno;
 #else
 # define LONG long
 
-#ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
-#endif
+# ifndef ULONG_MAX
+#  define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# endif
+# ifndef LONG_MAX
+#  define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# endif
 #endif
 
 #ifdef USE_WIDE_CHAR
@@ -342,9 +342,9 @@ noconv:
 
 #undef __P
 #if defined (__STDC__) && __STDC__
-#define __P(args) args
+# define __P(args) args
 #else
-#define __P(args) ()
+# define __P(args) ()
 #endif
 
 /* Prototype.  */

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 7aa04efa414dce97dff389c20185e8e7265fccad..84164acb3d464043b44dc4f12b21d44490f11c17 100644 (file)
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -18,7 +18,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -31,7 +31,7 @@ extern int errno;
 
 #ifndef HAVE_GETCWD
 char *getwd ();
-#define getcwd(buf, max) getwd (buf)
+# define getcwd(buf, max) getwd (buf)
 #else
 char *getcwd ();
 #endif

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index cd74aa7cecef9f6062635ef5f1c705785bb7764e..d20967574dacb8cc536b36d69ec705604609b940 100644 (file)
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -18,7 +18,7 @@
 /* Written by Jim Meyering, meyering@comco.com */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <sys/types.h>
@@ -28,7 +28,7 @@ char *xmalloc ();
 char *xrealloc ();
 
 #ifndef INITIAL_HOSTNAME_LENGTH
-#define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 33
 #endif
 
 char *

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index a9f1975b9507ecf40fb609a4ea14b9c26e292835..33ac504e29ed3a5b9d6d27b4d7b54c937e3f4b83 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -16,19 +16,19 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #if __STDC__
-#define VOID void
+# define VOID void
 #else
-#define VOID char
+# define VOID char
 #endif
 
 #include <sys/types.h>
 
 #if STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 VOID *malloc ();
 VOID *realloc ();
@@ -44,7 +44,7 @@ void free ();
 #endif
 
 #ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
+# define EXIT_FAILURE 1
 #endif
 
 /* Exit value when the requested amount of memory is not available.

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index f6edefccebc6d0071634fc7813ca5a18c1eead12..1e55cd1520406ded7e685dbfc309bf410c53b7d7 100644 (file)
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -18,11 +18,11 @@
 /* Written by Jim Meyering.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 double strtod ();
 #endif

diff --git a/lib/xstrtod.h b/lib/xstrtod.h
index 15b85f446fa4d994751980f530710dcedfbb679a..d40d5124bae67b31d05c133a134641aeac31ff15 100644 (file)
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,13 +1,13 @@
 #ifndef XSTRTOD_H
-#define XSTRTOD_H 1
+# define XSTRTOD_H 1
 
-#ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
+# ifndef __P
+#  if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#   define __P(args) args
+#  else
+#   define __P(args) ()
+#  endif  /* GCC.  */
+# endif  /* Not __P.  */
 
 int
   xstrtod __P ((const char *str, const char **ptr, double *result));

diff --git a/lib/xstrtoul.h b/lib/xstrtoul.h
index 8251c57db48580fcd85659d9343dc2a528068d0c..2e7aec07fe997b7053ca3299fef74f69c5fde598 100644 (file)
--- a/lib/xstrtoul.h
+++ b/lib/xstrtoul.h
@@ -1,7 +1,7 @@
 #ifndef _xstrtoul_h_
-#define _xstrtoul_h_ 1
+# define _xstrtoul_h_ 1
 
-#define STRING_TO_UNSIGNED 1
-#include "xstrtol.h"
+# define STRING_TO_UNSIGNED 1
+# include "xstrtol.h"
 
 #endif /* _xstrtoul_h_ */