Verify preprocessor directives. Pass them through cppi to

reflect their nesting level.

10 files changed, 155 insertions, 139 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c757cd..c88c812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,25 @@
 2011-08-13  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	Verify preprocessor directives. Pass them through cppi to
+	reflect their nesting level. Affected files:
+
+	* src/flatfile.c
+	* src/gdbmconst.h
+	* src/gdbm.h.in
+	* src/gdbmconst.h
+	* src/gdbmopen.c
+	* src/gdbmreorg.c
+	* src/lock.c
+	* src/mmap.c
+	* src/systems.h
+	* src/testgdbm.c
+
+2011-08-13  Sergey Poznyakoff  <gray@gnu.org.ua>
+
 	* NEWS, configure.ac: Version 1.9.1
 
 2011-08-12  Sergey Poznyakoff  <gray@gnu.org.ua>
-
+	
 	Bugfixes (pointed out by Matthew Burgess
 	<matthew@linuxfromscratch.org>).
 	
diff --git a/src/flatfile.c b/src/flatfile.c
index e851c65..c0f9422 100644
--- a/src/flatfile.c
+++ b/src/flatfile.c
@@ -19,11 +19,11 @@
 #ifndef _GDBMEXPORT_
 
 /* Include system configuration before all else. */
-#include "autoconf.h"
-#include <arpa/inet.h>
+# include "autoconf.h"
+# include <arpa/inet.h>
 
-#include "gdbmdefs.h"
-#include "gdbm.h"
+# include "gdbmdefs.h"
+# include "gdbm.h"
 
 #endif
 
diff --git a/src/gdbm.h.in b/src/gdbm.h.in
index 52e0373..d9a52da 100644
--- a/src/gdbm.h.in
+++ b/src/gdbm.h.in
@@ -27,49 +27,49 @@
 
 /* Protection for multiple includes. */
 #ifndef _GDBM_H_
-#define _GDBM_H_
+# define _GDBM_H_
 
 /* Parameters to gdbm_open for READERS, WRITERS, and WRITERS who
    can create the database. */
-#define GDBM_READER	0	/* A reader. */
-#define GDBM_WRITER	1	/* A writer. */
-#define GDBM_WRCREAT	2	/* A writer.  Create the db if needed. */
-#define GDBM_NEWDB	3	/* A writer.  Always create a new db. */
-#define GDBM_OPENMASK	7	/* Mask for the above. */
+# define GDBM_READER	0	/* A reader. */
+# define GDBM_WRITER	1	/* A writer. */
+# define GDBM_WRCREAT	2	/* A writer.  Create the db if needed. */
+# define GDBM_NEWDB	3	/* A writer.  Always create a new db. */
+# define GDBM_OPENMASK	7	/* Mask for the above. */
 
-#define GDBM_FAST	0x10	/* Write fast! => No fsyncs.  OBSOLETE. */
-#define GDBM_SYNC	0x20	/* Sync operations to the disk. */
-#define GDBM_NOLOCK	0x40	/* Don't do file locking operations. */
-#define GDBM_NOMMAP	0x80	/* Don't use mmap(). */
+# define GDBM_FAST	0x10	/* Write fast! => No fsyncs.  OBSOLETE. */
+# define GDBM_SYNC	0x20	/* Sync operations to the disk. */
+# define GDBM_NOLOCK	0x40	/* Don't do file locking operations. */
+# define GDBM_NOMMAP	0x80	/* Don't use mmap(). */
 
 /* Parameters to gdbm_store for simple insertion or replacement in the
    case that the key is already in the database. */
-#define GDBM_INSERT	0	/* Never replace old data with new. */
-#define GDBM_REPLACE	1	/* Always replace old data with new. */
+# define GDBM_INSERT	0	/* Never replace old data with new. */
+# define GDBM_REPLACE	1	/* Always replace old data with new. */
 
 /* Parameters to gdbm_setopt, specifing the type of operation to perform. */
-#define GDBM_SETCACHESIZE    1  /* Set the cache size. */
-#define GDBM_FASTMODE	     2	/* Toggle fast mode.  OBSOLETE. */
-#define GDBM_SETSYNCMODE     3  /* Turn on or off sync operations. */
-#define GDBM_SETCENTFREE     4  /* Keep all free blocks in the header. */
-#define GDBM_SETCOALESCEBLKS 5  /* Attempt to coalesce free blocks. */
-#define GDBM_SETMAXMAPSIZE   6  /* Set maximum mapped memory size */
-#define GDBM_SETMMAP         7  /* Toggle mmap mode */
+# define GDBM_SETCACHESIZE    1  /* Set the cache size. */
+# define GDBM_FASTMODE	     2	/* Toggle fast mode.  OBSOLETE. */
+# define GDBM_SETSYNCMODE     3  /* Turn on or off sync operations. */
+# define GDBM_SETCENTFREE     4  /* Keep all free blocks in the header. */
+# define GDBM_SETCOALESCEBLKS 5  /* Attempt to coalesce free blocks. */
+# define GDBM_SETMAXMAPSIZE   6  /* Set maximum mapped memory size */
+# define GDBM_SETMMAP         7  /* Toggle mmap mode */
 
 /* Compatibility defines: */
-#define GDBM_CACHESIZE	     GDBM_SETCACHESIZE
-#define GDBM_SYNCMODE	     GDBM_SETSYNCMODE
-#define GDBM_CENTFREE        GDBM_SETCENTFREE
-#define GDBM_COALESCEBLKS    GDBM_SETCOALESCEBLKS
-
-#define GDBM_GETFLAGS        8  /* Get gdbm_open flags */
-#define GDBM_GETMMAP         9  /* Get mmap status */
-#define GDBM_GETCACHESIZE    10 /* Get current cache side */
-#define GDBM_GETSYNCMODE     11 /* Get synch mode */
-#define GDBM_GETCENTFREE     12 /* Get "centfree" status */
-#define GDBM_GETCOALESCEBLKS 13 /* Get free block coalesce status */
-#define GDBM_GETMAXMAPSIZE   14 /* Get maximum mapped memory size */
-#define GDBM_GETDBNAME       15 /* Return database file name */
+# define GDBM_CACHESIZE	     GDBM_SETCACHESIZE
+# define GDBM_SYNCMODE	     GDBM_SETSYNCMODE
+# define GDBM_CENTFREE        GDBM_SETCENTFREE
+# define GDBM_COALESCEBLKS    GDBM_SETCOALESCEBLKS
+
+# define GDBM_GETFLAGS        8  /* Get gdbm_open flags */
+# define GDBM_GETMMAP         9  /* Get mmap status */
+# define GDBM_GETCACHESIZE    10 /* Get current cache side */
+# define GDBM_GETSYNCMODE     11 /* Get synch mode */
+# define GDBM_GETCENTFREE     12 /* Get "centfree" status */
+# define GDBM_GETCOALESCEBLKS 13 /* Get free block coalesce status */
+# define GDBM_GETMAXMAPSIZE   14 /* Get maximum mapped memory size */
+# define GDBM_GETDBNAME       15 /* Return database file name */
 
 /* The data and key structure. */
 typedef struct {
@@ -84,16 +84,16 @@ typedef struct gdbm_file_info *GDBM_FILE;
 /* External variable, the gdbm build release string. */
 extern const char *gdbm_version;	
 
-#define GDBM_VERSION_MAJOR @GDBM_VERSION_MAJOR@
-#define GDBM_VERSION_MINOR @GDBM_VERSION_MINOR@
-#define GDBM_VERSION_PATCH @GDBM_VERSION_PATCH@
+# define GDBM_VERSION_MAJOR @GDBM_VERSION_MAJOR@
+# define GDBM_VERSION_MINOR @GDBM_VERSION_MINOR@
+# define GDBM_VERSION_PATCH @GDBM_VERSION_PATCH@
 
 extern int const gdbm_version_number[3];
 
 /* GDBM C++ support */
-#if defined(__cplusplus) || defined(c_plusplus)
+# if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
-#endif
+# endif
 
 /* GDBM external functions. */
 
@@ -113,36 +113,36 @@ extern int gdbm_fdesc (GDBM_FILE);
 extern int gdbm_export (GDBM_FILE, const char *, int, int);
 extern int gdbm_import (GDBM_FILE, const char *, int);
 
-#if defined(__cplusplus) || defined(c_plusplus)
+# if defined(__cplusplus) || defined(c_plusplus)
 }
-#endif
-
-#define	GDBM_NO_ERROR		0
-#define	GDBM_MALLOC_ERROR	1
-#define	GDBM_BLOCK_SIZE_ERROR	2
-#define	GDBM_FILE_OPEN_ERROR	3
-#define	GDBM_FILE_WRITE_ERROR	4
-#define	GDBM_FILE_SEEK_ERROR	5
-#define	GDBM_FILE_READ_ERROR	6
-#define	GDBM_BAD_MAGIC_NUMBER	7
-#define	GDBM_EMPTY_DATABASE	8
-#define	GDBM_CANT_BE_READER	9
-#define	GDBM_CANT_BE_WRITER	10
-#define	GDBM_READER_CANT_DELETE	11
-#define	GDBM_READER_CANT_STORE	12
-#define	GDBM_READER_CANT_REORGANIZE	13
-#define	GDBM_UNKNOWN_UPDATE	14
-#define	GDBM_ITEM_NOT_FOUND	15
-#define	GDBM_REORGANIZE_FAILED	16
-#define	GDBM_CANNOT_REPLACE	17
-#define	GDBM_ILLEGAL_DATA	18
-#define	GDBM_OPT_ALREADY_SET	19
-#define	GDBM_OPT_ILLEGAL	20
-#define GDBM_BYTE_SWAPPED	21
-#define GDBM_BAD_FILE_OFFSET	22
-#define GDBM_BAD_OPEN_FLAGS	23
-#define _GDBM_MIN_ERRNO		0
-#define _GDBM_MAX_ERRNO		GDBM_BAD_OPEN_FLAGS
+# endif
+
+# define GDBM_NO_ERROR		0
+# define GDBM_MALLOC_ERROR	1
+# define GDBM_BLOCK_SIZE_ERROR	2
+# define GDBM_FILE_OPEN_ERROR	3
+# define GDBM_FILE_WRITE_ERROR	4
+# define GDBM_FILE_SEEK_ERROR	5
+# define GDBM_FILE_READ_ERROR	6
+# define GDBM_BAD_MAGIC_NUMBER	7
+# define GDBM_EMPTY_DATABASE	8
+# define GDBM_CANT_BE_READER	9
+# define GDBM_CANT_BE_WRITER	10
+# define GDBM_READER_CANT_DELETE	11
+# define GDBM_READER_CANT_STORE	12
+# define GDBM_READER_CANT_REORGANIZE	13
+# define GDBM_UNKNOWN_UPDATE	14
+# define GDBM_ITEM_NOT_FOUND	15
+# define GDBM_REORGANIZE_FAILED	16
+# define GDBM_CANNOT_REPLACE	17
+# define GDBM_ILLEGAL_DATA	18
+# define GDBM_OPT_ALREADY_SET	19
+# define GDBM_OPT_ILLEGAL	20
+# define GDBM_BYTE_SWAPPED	21
+# define GDBM_BAD_FILE_OFFSET	22
+# define GDBM_BAD_OPEN_FLAGS	23
+# define _GDBM_MIN_ERRNO		0
+# define _GDBM_MAX_ERRNO		GDBM_BAD_OPEN_FLAGS
 typedef int gdbm_error;		/* For compatibilities sake. */
 extern gdbm_error gdbm_errno;
 extern const char * const gdbm_errlist[];
@@ -150,15 +150,15 @@ extern const char * const gdbm_errlist[];
 /* extra prototypes */
 
 /* GDBM C++ support */
-#if defined(__cplusplus) || defined(c_plusplus)
+# if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
-#endif
+# endif
 
 extern const char *gdbm_strerror (gdbm_error);
 extern int gdbm_version_cmp (int const a[], int const b[]);
 
-#if defined(__cplusplus) || defined(c_plusplus)
+# if defined(__cplusplus) || defined(c_plusplus)
 }
-#endif
+# endif
 
 #endif
diff --git a/src/gdbmconst.h b/src/gdbmconst.h
index 24eac5f..0fb623e 100644
--- a/src/gdbmconst.h
+++ b/src/gdbmconst.h
@@ -18,8 +18,8 @@
    along with GDBM. If not, see <http://www.gnu.org/licenses/>.   */
 
 /* Start with the constant definitions.  */
-#define  TRUE    1
-#define  FALSE   0
+#define TRUE    1
+#define FALSE   0
 
 /* Header magic numbers.  Since we don't have space for flags or versions, we
    use different static numbers to determine what kind of file it is.
diff --git a/src/gdbmopen.c b/src/gdbmopen.c
index 4443bed..71292b5 100644
--- a/src/gdbmopen.c
+++ b/src/gdbmopen.c
@@ -24,11 +24,11 @@
 
 /* Determine our native magic number and bail if we can't. */
 #if SIZEOF_OFF_T == 4
-#define GDBM_MAGIC	GDBM_MAGIC32
+# define GDBM_MAGIC	GDBM_MAGIC32
 #elif SIZEOF_OFF_T == 8
-#define GDBM_MAGIC	GDBM_MAGIC64
+# define GDBM_MAGIC	GDBM_MAGIC64
 #else
-#error "Unsupported off_t size, contact GDBM maintainer.  What crazy system is this?!?"
+# error "Unsupported off_t size, contact GDBM maintainer.  What crazy system is this?!?"
 #endif
 
 /* Initialize dbm system.  FILE is a pointer to the file name.  If the file
diff --git a/src/gdbmreorg.c b/src/gdbmreorg.c
index 7911857..506a1b9 100644
--- a/src/gdbmreorg.c
+++ b/src/gdbmreorg.c
@@ -43,7 +43,7 @@ _gdbm_rename (char *old_name, char *new_name)
 
 }
 
-#define rename _gdbm_rename
+# define rename _gdbm_rename
 #endif
 
 
diff --git a/src/lock.c b/src/lock.c
index d15f3d3..214e1cb 100644
--- a/src/lock.c
+++ b/src/lock.c
@@ -24,27 +24,27 @@
 #include <errno.h>
 
 #if HAVE_FLOCK
-#ifndef LOCK_SH
-#define LOCK_SH 1
-#endif
+# ifndef LOCK_SH
+#  define LOCK_SH 1
+# endif
 
-#ifndef LOCK_EX
-#define LOCK_EX 2
-#endif
+# ifndef LOCK_EX
+#  define LOCK_EX 2
+# endif
 
-#ifndef LOCK_NB
-#define LOCK_NB 4
-#endif
+# ifndef LOCK_NB
+#  define LOCK_NB 4
+# endif
 
-#ifndef LOCK_UN
-#define LOCK_UN 8
-#endif
+# ifndef LOCK_UN
+#  define LOCK_UN 8
+# endif
 #endif
 
 #if defined(F_SETLK) && defined(F_RDLCK) && defined(F_WRLCK)
-#define HAVE_FCNTL_LOCK 1
+# define HAVE_FCNTL_LOCK 1
 #else
-#define HAVE_FCNTL_LOCK 0
+# define HAVE_FCNTL_LOCK 0
 #endif
 
 #if 0
diff --git a/src/mmap.c b/src/mmap.c
index f654af3..f0cd4e3 100644
--- a/src/mmap.c
+++ b/src/mmap.c
@@ -18,32 +18,32 @@
 
 #if HAVE_MMAP
 
-#include "gdbmdefs.h"
+# include "gdbmdefs.h"
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/file.h>
+# include <sys/stat.h>
+# include <sys/mman.h>
+# include <stdio.h>
 
 /* Some systems fail to define this */
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
+# ifndef MAP_FAILED
+#  define MAP_FAILED ((void*)-1)
+# endif
 
 /* Translate current offset in the mapped region into the absolute position */
-#define _GDBM_MMAPPED_POS(dbf) ((dbf)->mapped_off + (dbf)->mapped_pos)
+# define _GDBM_MMAPPED_POS(dbf) ((dbf)->mapped_off + (dbf)->mapped_pos)
 /* Return true if the absolute offset OFF lies within the currentlty mmapped
    region */
-#define _GDBM_IN_MAPPED_REGION_P(dbf, off) \
+# define _GDBM_IN_MAPPED_REGION_P(dbf, off) \
   ((off) >= (dbf)->mapped_off \
    && ((off) - (dbf)->mapped_off) < (dbf)->mapped_size)
 /* Return true if the current region needs to be remapped */
-#define _GDBM_NEED_REMAP(dbf) \
+# define _GDBM_NEED_REMAP(dbf) \
   (!(dbf)->mapped_region || (dbf)->mapped_pos == (dbf)->mapped_size)
 /* Return the sum of the currently mapped size and DELTA */
-#define SUM_FILE_SIZE(dbf, delta) \
+# define SUM_FILE_SIZE(dbf, delta) \
   ((dbf)->mapped_off + (dbf)->mapped_size + (delta))
 
 /* Store the size of the GDBM file DBF in *PSIZE.
@@ -107,9 +107,9 @@ _gdbm_internal_remap (GDBM_FILE dbf, size_t size)
   return 0;
 }
 
-#define _REMAP_DEFAULT 0
-#define _REMAP_EXTEND  1
-#define _REMAP_END     2
+# define _REMAP_DEFAULT 0
+# define _REMAP_EXTEND  1
+# define _REMAP_END     2
 
 /* Remap the GDBM file so that its mapped region ends on SIZEth byte.
    If the file is opened with write permissions, FLAG controls how
diff --git a/src/systems.h b/src/systems.h
index a6b67c9..b24729f 100644
--- a/src/systems.h
+++ b/src/systems.h
@@ -19,70 +19,70 @@
 
 /* Include all system headers first. */
 #if HAVE_SYS_TYPES_H
-#include <sys/types.h>
+# include <sys/types.h>
 #endif
 #include <stdio.h>
 #if HAVE_SYS_FILE_H
-#include <sys/file.h>
+# include <sys/file.h>
 #endif
 #include <sys/stat.h>
 #if HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 #if HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif
 #if HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #if HAVE_FCNTL_H
-#include <fcntl.h>
+# include <fcntl.h>
 #endif
 
 #ifndef SEEK_SET
-#define SEEK_SET        0
+# define SEEK_SET        0
 #endif
 
 #ifndef L_SET
-#define L_SET SEEK_SET
+# define L_SET SEEK_SET
 #endif
 
 /* Default block size.  Some systems do not have blocksize in their
    stat record. This code uses the BSD blocksize from stat. */
 
 #if HAVE_STRUCT_STAT_ST_BLKSIZE
-#define STATBLKSIZE file_stat.st_blksize
+# define STATBLKSIZE file_stat.st_blksize
 #else
-#define STATBLKSIZE 1024
+# define STATBLKSIZE 1024
 #endif
 
 /* Do we have ftruncate? */
 #if HAVE_FTRUNCATE
-#define TRUNCATE(dbf) ftruncate (dbf->desc, 0)
+# define TRUNCATE(dbf) ftruncate (dbf->desc, 0)
 #else
-#define TRUNCATE(dbf) close( open (dbf->name, O_RDWR|O_TRUNC, mode));
+# define TRUNCATE(dbf) close( open (dbf->name, O_RDWR|O_TRUNC, mode));
 #endif
 
 #ifndef STDERR_FILENO
-#define STDERR_FILENO 2
+# define STDERR_FILENO 2
 #endif
 
 /* I/O macros. */
 #if HAVE_MMAP
-#define __read(_dbf, _buf, _size)	_gdbm_mapped_read(_dbf, _buf, _size)
-#define __write(_dbf, _buf, _size)	_gdbm_mapped_write(_dbf, _buf, _size)
-#define __lseek(_dbf, _off, _whn)	_gdbm_mapped_lseek(_dbf, _off, _whn)
-#define __fsync(_dbf)			_gdbm_mapped_sync(_dbf)
+# define __read(_dbf, _buf, _size)	_gdbm_mapped_read(_dbf, _buf, _size)
+# define __write(_dbf, _buf, _size)	_gdbm_mapped_write(_dbf, _buf, _size)
+# define __lseek(_dbf, _off, _whn)	_gdbm_mapped_lseek(_dbf, _off, _whn)
+# define __fsync(_dbf)			_gdbm_mapped_sync(_dbf)
 #else
-#define __read(_dbf, _buf, _size)	read(_dbf->desc, _buf, _size)
-#define __write(_dbf, _buf, _size)	write(_dbf->desc, _buf, _size)
-#define __lseek(_dbf, _off, _whn)	lseek(_dbf->desc, _off, _whn)
-#if HAVE_FSYNC
-#define __fsync(_dbf)			fsync(_dbf->desc)
-#else
-#define __fsync(_dbf)			{ sync(); sync(); }
-#endif
+# define __read(_dbf, _buf, _size)	read(_dbf->desc, _buf, _size)
+# define __write(_dbf, _buf, _size)	write(_dbf->desc, _buf, _size)
+# define __lseek(_dbf, _off, _whn)	lseek(_dbf->desc, _off, _whn)
+# if HAVE_FSYNC
+#  define __fsync(_dbf)			fsync(_dbf->desc)
+# else
+#  define __fsync(_dbf)			{ sync(); sync(); }
+# endif
 #endif
 
diff --git a/src/testgdbm.c b/src/testgdbm.c
index 65812cb..276f649 100644
--- a/src/testgdbm.c
+++ b/src/testgdbm.c
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
+# include <sys/termios.h>
 #endif
 #include <stdarg.h>