Add multiple include avoidance and c++ prototype wrapping throughout *.h.

Delete trailing white space in *.h.

CVS patchset: 2181
CVS date: 1998/07/25 15:10:58

30 files changed, 187 insertions, 70 deletions

diff --git a/build/build.h b/build/build.h
index 62c27fe94..290596fc3 100644
--- a/build/build.h
+++ b/build/build.h
@@ -1,3 +1,6 @@
+#ifndef	_H_BUILD_
+#define	_H_BUILD_
+
 #include "spec.h"
 
 #define RPMBUILD_PREP             (1 << 0)
@@ -11,6 +14,15 @@
 #define RPMBUILD_RMBUILD          (1 << 8)
 #define RPMBUILD_STRINGBUF        (1 << 9) /* only for doScript() */
 
-int buildSpec(Spec spec, int what, int test);
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+int buildSpec(Spec spec, int what, int test);
 int doScript(Spec spec, int what, char *name, StringBuf sb, int test);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _H_BUILD_ */
diff --git a/build/files.h b/build/files.h
index 242bfc94f..462b549f8 100644
--- a/build/files.h
+++ b/build/files.h
@@ -1,8 +1,20 @@
+#ifndef	_H_FILES_
+#define	_H_FILES_
+
 #include "spec.h"
 #include "package.h"
 #include "lib/cpio.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int processBinaryFiles(Spec spec, int installSpecialDoc, int test);
 int processSourceFiles(Spec spec);
 void freeCpioList(struct cpioFileMapping *cpioList, int cpioCount);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _H_FILES_ */
diff --git a/build/macro.h b/build/macro.h
index a35a8d916..68a4317f7 100644
--- a/build/macro.h
+++ b/build/macro.h
@@ -1,5 +1,5 @@
-#ifndef _MACRO_H
-#define	_MACRO_H
+#ifndef _H_MACRO_
+#define	_H_MACRO_
 
 typedef struct MacroEntry {
 	struct MacroEntry *prev;
@@ -24,6 +24,10 @@ typedef struct MacroContext {
 #endif
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void	initMacros	__P((MacroContext *mc, const char *macrofile));
 void	freeMacros	__P((MacroContext *mc));
 
@@ -33,4 +37,8 @@ int	expandMacros	__P((Spec spec, MacroContext *mc, char *sbuf, size_t sbuflen));
 
 const char *getMacroBody __P((MacroContext *mc, const char *name));
 
-#endif	/* _MACRO_H */
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _H_ MACRO_ */
diff --git a/build/misc.h b/build/misc.h
index 4412fbf44..534bcc708 100644
--- a/build/misc.h
+++ b/build/misc.h
@@ -1,5 +1,5 @@
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef _H_MISC_
+#define _H_MISC_
 
 #include "spec.h"
 #include "ctype.h"
@@ -15,6 +15,10 @@
 #define PART_SUBNAME  0
 #define PART_NAME     1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void addOrAppendListEntry(Header h, int_32 tag, char *line);
 int parseSimplePart(char *line, char **name, int *flag);
 char *findLastChar(char *s);
@@ -25,4 +29,8 @@ StringBuf getOutputFrom(char *dir, char *argv[],
 			int failNonZero);
 char *cleanFileName(char *name);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_MISC_ */
diff --git a/build/myftw.h b/build/myftw.h
index 11b515643..bb9a41ca5 100644
--- a/build/myftw.h
+++ b/build/myftw.h
@@ -1,7 +1,7 @@
 /* myftw.h -- ftw() using lstat() instead of stat() */
 
-#ifndef _MYFTW_H_
-#define _MYFTW_H_
+#ifndef _H_MYFTW_
+#define _H_MYFTW_
 
 #include <sys/stat.h>
 
@@ -11,6 +11,10 @@
 #define MYFTW_DNR	2		/* Unreadable directory.  */
 #define MYFTW_NS	3		/* Unstatable file.  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int (*myftwFunc) (void *fl, char *name, struct stat *statp);
 
 int myftw (const char *dir,
@@ -18,4 +22,8 @@ int myftw (const char *dir,
 	   myftwFunc func,
 	   void *fl);
 
-#endif /* _MYFTW_H_ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _H_MYFTW_ */
diff --git a/build/names.h b/build/names.h
index 965323f39..49bf2f15b 100644
--- a/build/names.h
+++ b/build/names.h
@@ -1,10 +1,14 @@
 /* names.h -- user/group name/id cache plus hostname and buildtime */
 
-#ifndef _NAMES_H_
-#define _NAMES_H_
+#ifndef _H_NAMES_
+#define _H_NAMES_
 
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 char *getUname(uid_t uid);
 char *getUnameS(char *uname);
 char *getGname(gid_t gid);
@@ -13,4 +17,8 @@ char *getGnameS(char *gname);
 char *buildHost(void);
 time_t *getBuildTime(void);
 
-#endif /* _NAMES_H_ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _H_NAMES_ */
diff --git a/build/pack.h b/build/pack.h
index 51905e209..d9c55d521 100644
--- a/build/pack.h
+++ b/build/pack.h
@@ -1,4 +1,17 @@
+#ifndef	_H_PACK_
+#define	_H_PACK_
+
 #include "spec.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int packageBinaries(Spec spec);
 int packageSources(Spec spec);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _H_PACK_ */
diff --git a/build/package.h b/build/package.h
index 908638612..80e0ec67d 100644
--- a/build/package.h
+++ b/build/package.h
@@ -1,9 +1,17 @@
-#ifndef _PACKAGE_H_
-#define _PACKAGE_H_
+#ifndef _H_PACKAGE_
+#define _H_PACKAGE_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int lookupPackage(Spec spec, char *name, int flag, Package *pkg);
 Package newPackage(Spec spec);
 void freePackages(Spec spec);
 void freePackage(Package p);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_PACKAGE_ */
diff --git a/build/parse.h b/build/parse.h
index 3fb88cb95..917b8cd2b 100644
--- a/build/parse.h
+++ b/build/parse.h
@@ -1,5 +1,9 @@
-#ifndef _PARSE_H_
-#define _PARSE_H_
+#ifndef _H_PARSE_
+#define _H_PARSE_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int parseChangelog(Spec spec);
 int parseDescription(Spec spec);
@@ -16,4 +20,8 @@ int parseBuildInstallClean(Spec spec, int parsePart);
 int parseSpec(Spec *specp, char *specFile, char *buildRoot,
 	      int inBuildArch, char *passPhrase, char *cookie);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_PARSE_ */
diff --git a/build/part.h b/build/part.h
index af135e813..390dc462e 100644
--- a/build/part.h
+++ b/build/part.h
@@ -1,5 +1,5 @@
-#ifndef _PART_H_
-#define _PART_H_
+#ifndef _H_PART_
+#define _H_PART_
 
 #define PART_NONE                0
 #define PART_PREAMBLE            1
@@ -20,6 +20,14 @@
 #define PART_BUILDARCHITECTURES 16
 #define PART_TRIGGERPOSTUN      17
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int isPart(char *line);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_PART_ */
diff --git a/build/read.h b/build/read.h
index 238cdd540..dbe1fdaf4 100644
--- a/build/read.h
+++ b/build/read.h
@@ -1,5 +1,5 @@
-#ifndef _READ_H_
-#define _READ_H_
+#ifndef _H_READ_
+#define _H_READ_
 
 #include "spec.h"
 
@@ -11,8 +11,16 @@
 /*         1 - EOF     */
 /*        <0 - error   */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int readLine(Spec spec, int strip);
 void closeSpec(Spec spec);
 void handleComments(char *s);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_READ_ */
diff --git a/build/reqprov.h b/build/reqprov.h
index 29831715a..990139aae 100644
--- a/build/reqprov.h
+++ b/build/reqprov.h
@@ -1,14 +1,22 @@
-#ifndef _REQPROV_H_
-#define _REQPROV_H_
+#ifndef _H_REQPROV_
+#define _H_REQPROV_
 
 #include "spec.h"
 #include "package.h"
 #include "lib/cpio.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int addReqProv(Spec spec, Package pkg,
 	       int flag, char *name, char *version, int index);
 int generateAutoReqProv(Spec spec, Package pkg,
 			struct cpioFileMapping *cpioList, int cpioCount);
 void printReqs(Spec spec, Package pkg);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _H_REQPROV_ */
diff --git a/build/spec.h b/build/spec.h
index 6efc706ca..796fa36e2 100644
--- a/build/spec.h
+++ b/build/spec.h
@@ -1,5 +1,5 @@
-#ifndef _SPEC_H_
-#define _SPEC_H_
+#ifndef _H_SPEC_
+#define _H_SPEC_
 
 #include "header.h"
 #include "stringbuf.h"
@@ -62,7 +62,7 @@ struct SpecStruct {
     char ** buildArchitectures;
     int buildArchitectureCount;
     int inBuildArchitectures;
-    
+
     int gotBuildRoot;
     char *buildRoot;
     char *buildSubdir;
@@ -80,12 +80,12 @@ struct SpecStruct {
     Header sourceHeader;
     int sourceCpioCount;
     struct cpioFileMapping *sourceCpioList;
-    
+
     struct MacroContext macros;
 
     int autoReq;
     int autoProv;
-    
+
     StringBuf prep;
     StringBuf build;
     StringBuf install;
@@ -111,14 +111,14 @@ struct PackageStruct {
     char *verifyFile;
 
     StringBuf specialDoc;
-    
-#if 0    
+
+#if 0
     struct ReqProvTrigger *triggers;
     char *triggerScripts;
 #endif
 
     struct TriggerFileEntry *triggerFiles;
-    
+
     char *fileFile;
     StringBuf fileList; /* If NULL, package will not be written */
 
@@ -127,6 +127,10 @@ struct PackageStruct {
 
 typedef struct PackageStruct *Package;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 Spec newSpec(void);
 void freeSpec(Spec spec);
 
@@ -136,4 +140,8 @@ char *getFullSource(Spec spec, int num, int flag);
 void freeSources(Spec spec);
 int parseNoSource(Spec spec, char *field, int tag);
 
-#endif /* _SPEC_H_ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _H_SPEC_ */
diff --git a/lib/dbindex.h b/lib/dbindex.h
index 1e9de4aa3..4985d5ca7 100644
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -46,4 +46,4 @@ void dbiFreeIndexRecord(dbiIndexSet set);
 }
 #endif
 
-#endif
+#endif	/* H_DBINDEX */
diff --git a/lib/depends.h b/lib/depends.h
index 8e5b0e395..f09858863 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -5,4 +5,4 @@
 
 int headerMatchesDepFlags(Header h, char * reqInfo, int reqFlags);
 
-#endif
+#endif	/* H_DEPENDS */
diff --git a/lib/falloc.h b/lib/falloc.h
index 2fe8be2b2..96b06d13f 100644
--- a/lib/falloc.h
+++ b/lib/falloc.h
@@ -24,4 +24,4 @@ void faClose(faFile fa);
 int faFirstOffset(faFile fa);
 int faNextOffset(faFile fa, unsigned int lastOffset);  /* 0 at end */
 
-#endif /* H_FALLOC */
+#endif	/* H_FALLOC */
diff --git a/lib/header.h b/lib/header.h
index bd21ccff7..2e6b6ed6f 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -1,5 +1,5 @@
 /* RPM - Copyright (C) 1995 Red Hat Software
- * 
+ *
  * header.h - routines for managing rpm tagged structures
  */
 
@@ -47,7 +47,7 @@ enum headerSprintfExtenstionType { HEADER_EXT_LAST = 0, HEADER_EXT_FORMAT,
 
 /* This will only ever be passed RPM_TYPE_INT32 or RPM_TYPE_STRING to
    help keep things simple */
-typedef char * (*headerTagFormatFunction)(int_32 type, const void * data, 
+typedef char * (*headerTagFormatFunction)(int_32 type, const void * data,
 					  char * formatPrefix,
 					  int padding, int element);
 /* This is allowed to fail, which indicates the tag doesn't exist */
@@ -87,18 +87,18 @@ Header headerNew(void);
 void headerFree(Header h);
 
 /* dump a header to a file, in human readable format */
-void headerDump(Header h, FILE *f, int flags, 
+void headerDump(Header h, FILE *f, int flags,
 		const struct headerTagTableEntry * tags);
 
 /* the returned string must be free()d */
-char * headerSprintf(Header h, const char * fmt, 
+char * headerSprintf(Header h, const char * fmt,
 		     const struct headerTagTableEntry * tags,
 		     const struct headerSprintfExtension * extentions,
 		     char ** error);
 
 #define HEADER_DUMP_INLINE   1
 
-/* Duplicate tags are okay, but only defined for iteration (with the 
+/* Duplicate tags are okay, but only defined for iteration (with the
    exceptions noted below). While you are allowed to add i18n string
    arrays through this function, you probably don't mean to. See
    headerAddI18NString() instead */
@@ -107,7 +107,7 @@ int headerAddEntry(Header h, int_32 tag, int_32 type, void *p, int_32 c);
 int headerModifyEntry(Header h, int_32 tag, int_32 type, void *p, int_32 c);
 
 /* A NULL lang is interpreted as the C locale.  Here are the rules:
-   
+
 	1) If the tag isn't in the Header, it's added with the passed string
 	   as a version.
 	2) If the tag occurs multiple times in entry, which tag is affected
@@ -171,7 +171,7 @@ void headerSort(Header h);
 #define RPM_STRING_ARRAY_TYPE	8
 #define RPM_I18NSTRING_TYPE	9
 
-/* Tags -- general use tags should start at 1000 (RPM's tag space starts 
+/* Tags -- general use tags should start at 1000 (RPM's tag space starts
    there) */
 
 #define HEADER_I18NTABLE	100
@@ -180,4 +180,4 @@ void headerSort(Header h);
 }
 #endif
 
-#endif /* H_HEADER */
+#endif	/* H_HEADER */
diff --git a/lib/install.h b/lib/install.h
index 689b0b9ac..9e1e5272a 100644
--- a/lib/install.h
+++ b/lib/install.h
@@ -15,11 +15,11 @@ int findSharedFiles(rpmdb db, int offset, char ** fileList, int fileCount,
 int runInstScript(char * prefix, Header h, int scriptTag, int progTag,
 	          int arg, int norunScripts, int err);
 /* this looks for triggers in the database which h would set off */
-int runTriggers(char * root, rpmdb db, int sense, Header h, 
+int runTriggers(char * root, rpmdb db, int sense, Header h,
 		int countCorrection);
-/* while this looks for triggers in h which are set off by things in the db 
+/* while this looks for triggers in h which are set off by things in the db
    database to calculate arguments to the trigger */
 int runImmedTriggers(char * root, rpmdb db, int sense, Header h,
 		     int countCorrection);
 
-#endif
+#endif	/* H_INSTALL */
diff --git a/lib/md5.h b/lib/md5.h
index 52b367ece..bee55716e 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -23,7 +23,7 @@ void MD5Transform(uint32 buf[4], uint32 const in[16]);
 int mdfile(char *fn, unsigned char *digest);
 int mdbinfile(char *fn, unsigned char *bindigest);
 
-/* These assume a little endian machine and return incorrect results! 
+/* These assume a little endian machine and return incorrect results!
    They are here for compatibility with old (broken) versions of RPM */
 int mdfileBroken(char *fn, unsigned char *digest);
 int mdbinfileBroken(char *fn, unsigned char *bindigest);
@@ -33,4 +33,4 @@ int mdbinfileBroken(char *fn, unsigned char *bindigest);
  */
 typedef struct MD5Context MD5_CTX;
 
-#endif /* !MD5_H */
+#endif	/* MD5_H */
diff --git a/lib/messages.h b/lib/messages.h
index b48573529..749c05725 100644
--- a/lib/messages.h
+++ b/lib/messages.h
@@ -5,4 +5,4 @@
 
 void rpmMessage(int level, char * format, ...);
 
-#endif
+#endif	/* H_MESSAGES */
diff --git a/lib/misc.h b/lib/misc.h
index 5eeb747d6..9f874e855 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -28,4 +28,4 @@ char * gidToGname(gid_t gid);
 
 int makeTempFile(char * prefix, char ** fnptr, int * fdptr);
 
-#endif
+#endif	/* H_MISC */
diff --git a/lib/oldheader.h b/lib/oldheader.h
index 731d1c3b1..cd03b03a5 100644
--- a/lib/oldheader.h
+++ b/lib/oldheader.h
@@ -19,7 +19,7 @@ struct oldrpmFileInfo {
 } ;
 
 void oldrpmfileFromSpecLine(char * str, struct oldrpmFileInfo * fi);
-void oldrpmfileFromInfoLine(char * path, char * state, char * str, 
+void oldrpmfileFromInfoLine(char * path, char * state, char * str,
 			struct oldrpmFileInfo * fi);
 void oldrpmfileFree(struct oldrpmFileInfo * fi);
 char * oldrpmfileToInfoStr(struct oldrpmFileInfo * fi);
@@ -57,4 +57,4 @@ char * oldhdrParseSpec(struct oldrpmHeader * header, struct oldrpmHeaderSpec * s
 void   oldhdrFree(struct oldrpmHeader * header);
 void   oldhdrSpecFree(struct oldrpmHeaderSpec * spec);
 
-#endif
+#endif	/* H_OLDHEADER */
diff --git a/lib/oldrpmdb.h b/lib/oldrpmdb.h
index 675ac28f3..d0884d2bc 100644
--- a/lib/oldrpmdb.h
+++ b/lib/oldrpmdb.h
@@ -61,11 +61,11 @@ struct oldrpmdbLabel *oldrpmdbFindPackagesByFile (struct oldrpmdb *oldrpmdb, cha
 struct oldrpmdbLabel *oldrpmdbFindPackagesByLabel (struct oldrpmdb *oldrpmdb,
 						struct oldrpmdbLabel label);
 
-char *oldrpmdbGetPackageGroup (struct oldrpmdb *oldrpmdb, 
+char *oldrpmdbGetPackageGroup (struct oldrpmdb *oldrpmdb,
 			       struct oldrpmdbLabel label);
-char *oldrpmdbGetPackagePostun (struct oldrpmdb *oldrpmdb, 
+char *oldrpmdbGetPackagePostun (struct oldrpmdb *oldrpmdb,
 				struct oldrpmdbLabel label);
-char *oldrpmdbGetPackagePreun (struct oldrpmdb *oldrpmdb, 
+char *oldrpmdbGetPackagePreun (struct oldrpmdb *oldrpmdb,
 				struct oldrpmdbLabel label);
 char *oldrpmdbGetPackageGif (struct oldrpmdb *oldrpmdb, struct oldrpmdbLabel label,
 			     int *size);
@@ -85,4 +85,4 @@ int oldrpmdbLabelCmp (struct oldrpmdbLabel *one, struct oldrpmdbLabel *two);
 
 void oldrpmdbSetPrefix (char *new);
 
-#endif
+#endif	/* _H_OLDRPMDB */
diff --git a/lib/rpm_malloc.h b/lib/rpm_malloc.h
index 3f6985cf3..6706ed8ad 100644
--- a/lib/rpm_malloc.h
+++ b/lib/rpm_malloc.h
@@ -3,4 +3,4 @@
 
 /* placeholder */
 
-#endif
+#endif	/* H_RPM_MALLOC */
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 396717b61..c1f1093ee 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -5,7 +5,7 @@
 
 /* for RPM's internal use only */
 
-int openDatabase(char * prefix, char * dbpath, rpmdb *rpmdbp, int mode, 
+int openDatabase(char * prefix, char * dbpath, rpmdb *rpmdbp, int mode,
 		 int perms, int justcheck);
 int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant);
 int rpmdbAdd(rpmdb db, Header dbentry);
@@ -13,4 +13,4 @@ int rpmdbUpdateRecord(rpmdb db, int secOffset, Header secHeader);
 void rpmdbRemoveDatabase(char * rootdir, char * dbpath);
 int rpmdbMoveDatabase(char * rootdir, char * olddbpath, char * newdbpath);
 
-#endif
+#endif	/* H_RPMDB */
diff --git a/lib/rpmlead.h b/lib/rpmlead.h
index a8c3f7322..157d6a1f4 100644
--- a/lib/rpmlead.h
+++ b/lib/rpmlead.h
@@ -8,4 +8,4 @@
 int writeLead(int fd, struct rpmlead *lead);
 int readLead(int fd, struct rpmlead *lead);
 
-#endif
+#endif	/* _H_RPMLEAD */
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 4e0b2a2f3..6bc50b1ae 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -129,7 +129,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 #define RPMTAG_TRIGGERPOSTUN            1102 /* internal */
 #define RPMTAG_AUTOREQ                  1103 /* internal */
 #define RPMTAG_AUTOPROV                 1104 /* internal */
-    
+
 #define RPMTAG_EXTERNAL_TAG		1000000
 
 #define RPMFILE_STATE_NORMAL 		0
@@ -145,7 +145,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 #define RPMFILE_NOREPLACE               (1 << 4)
 #define RPMFILE_SPECFILE                (1 << 5)
 #define RPMFILE_GHOST                   (1 << 6)
-    
+
 #define RPMINSTALL_REPLACEPKG           (1 << 0)
 #define RPMINSTALL_REPLACEFILES         (1 << 1)
 #define RPMINSTALL_TEST                 (1 << 2)
@@ -283,7 +283,7 @@ int rpmdbInit(char * root, int perms);
 void rpmdbClose (rpmdb db);
 
 int rpmdbFirstRecNum(rpmdb db);
-int rpmdbNextRecNum(rpmdb db, unsigned int lastOffset);  
+int rpmdbNextRecNum(rpmdb db, unsigned int lastOffset);
     /* 0 at end, -1 on error */
 
 Header rpmdbGetRecord(rpmdb db, unsigned int offset);
@@ -315,7 +315,7 @@ int rpmVersionCompare(Header first, Header second);
 int rpmRemovePackage(char * root, rpmdb db, unsigned int offset, int flags);
 int rpmdbRebuild(char * root);
 
-int rpmVerifyFile(char * root, Header h, int filenum, int * result, 
+int rpmVerifyFile(char * root, Header h, int filenum, int * result,
 		  int omitMask);
 int rpmVerifyScript(char * root, Header h, int err);
 
@@ -339,10 +339,10 @@ void rpmdepUpgradePackage(rpmDependencies rpmdep, Header h, void * key);
 void rpmdepRemovePackage(rpmDependencies rpmdep, int dboffset);
 
 /* this checks for dependency satisfaction, but *not* ordering */
-int rpmdepCheck(rpmDependencies rpmdep, 
+int rpmdepCheck(rpmDependencies rpmdep,
 		struct rpmDependencyConflict ** conflicts, int * numConflicts);
 /* Orders items, returns error on circle, finals keys[] is NULL. No dependency
-   check is done, use rpmdepCheck() for that. If dependencies are not 
+   check is done, use rpmdepCheck() for that. If dependencies are not
    satisfied a "best-try" ordering is returned. */
 int rpmdepOrder(rpmDependencies order, void *** keysListPtr);
 
@@ -513,5 +513,4 @@ int rpmGetFilesystemUsage(char ** filelist, int_32 * fssizes, int numFiles,
 }
 #endif
 
-    
-#endif
+#endif	/* H_RPMLIB */
diff --git a/lib/signature.h b/lib/signature.h
index e6cf347ea..0d5ea58a6 100644
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -1,4 +1,5 @@
 #ifndef H_SIGNATURE
+#define	H_SIGNATURE
 
 /* signature.h - generate and verify signatures */
 
@@ -48,4 +49,4 @@ int rpmLookupSignatureType(void);
 /* Utility to read a pass phrase from the user */
 char *rpmGetPassPhrase(char *prompt);
 
-#endif
+#endif	/* H_SIGNATURE */
diff --git a/lib/stringbuf.h b/lib/stringbuf.h
index ab0e34233..ea6136f26 100644
--- a/lib/stringbuf.h
+++ b/lib/stringbuf.h
@@ -14,4 +14,4 @@ void stripTrailingBlanksStringBuf(StringBuf sb);
 
 void appendStringBufAux(StringBuf sb, char *s, int nl);
 
-#endif /* _STRINGBUF_H_ */
+#endif	/* _STRINGBUF_H_ */
diff --git a/lib/tread.h b/lib/tread.h
index b1725833a..8c953dfa2 100644
--- a/lib/tread.h
+++ b/lib/tread.h
@@ -3,4 +3,4 @@
 
 int timedRead(int fd, void * bufptr, int length);
 
-#endif
+#endif	/* H_TREAD */