dumb cpp's want white space around lclint annotations (Tim Mooney).

aix: aix.req broken by cut-and-paste (Tim Mooney).

CVS patchset: 3367
CVS date: 1999/10/04 20:18:48

21 files changed, 120 insertions, 102 deletions

diff --git a/CHANGES b/CHANGES
index 5f9598ae8..4525da7be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -67,6 +67,8 @@
 	- updated pl/rpm.8 (PLD team).
 	- new find req/prov scripts for non-linux platforms (Tim Mooney).
 	- fix: non-GNU globs burp on repeated '/' in patterns.
+	- dumb cpp's want white space around lclint annotations (Tim Mooney).
+	- aix: aix.req broken by cut-and-paste (Tim Mooney).
 
 3.0.1 -> 3.0.2
 	- eliminate armv4 entries from rpmrc (Andrew E. Mileski).
diff --git a/autodeps/aix.req b/autodeps/aix.req
index 63938dbb0..53ca70406 100755
--- a/autodeps/aix.req
+++ b/autodeps/aix.req
@@ -32,16 +32,14 @@
 
 #
 #
-filelist=`sed "s/['\"]/\\\&/g" | xargs file | grep -e executable -e archive
- | cut -d: -f1`
+filelist=`sed "s/['\"]/\\\&/g" | xargs file | grep -e executable -e archive | cut -d: -f1`
 
 for f in $filelist
 do
         dump -H $f | awk '
 
                 #
-                # For you non-awk-ers, no single quotes in comments -- the
-shell
+                # For you non-awk-ers, no single quotes in comments -- the shell
                 # sees them and things get hosed.
                 #
 
diff --git a/lib/cpio.c b/lib/cpio.c
index f22cd9acf..6e83d8e85 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -463,7 +463,7 @@ static int expandSymlink(CFD_t * cfd, struct cpioHeader * hdr)
     return 0;
 }
 
-static int expandFifo(/*@unused@*/CFD_t * cfd, struct cpioHeader * hdr)
+static int expandFifo( /*@unused@*/ CFD_t * cfd, struct cpioHeader * hdr)
 {
     struct stat sb;
 
@@ -480,7 +480,7 @@ static int expandFifo(/*@unused@*/CFD_t * cfd, struct cpioHeader * hdr)
     return 0; 
 }
 
-static int expandDevice(/*@unused@*/CFD_t * cfd, struct cpioHeader * hdr)
+static int expandDevice( /*@unused@*/ CFD_t * cfd, struct cpioHeader * hdr)
 {
     struct stat sb;
 
@@ -492,13 +492,13 @@ static int expandDevice(/*@unused@*/CFD_t * cfd, struct cpioHeader * hdr)
 	    return CPIOERR_UNLINK_FAILED;
     }
 
-    if (/*@-unrecog@*/ mknod(hdr->path, hdr->mode & (~0777), hdr->rdev) /*@=unrecog@*/)
+    if ( /*@-unrecog@*/ mknod(hdr->path, hdr->mode & (~0777), hdr->rdev) /*@=unrecog@*/ )
 	return CPIOERR_MKNOD_FAILED;
     
     return 0;
 }
 
-static void freeLink(/*@only@*/struct hardLink * li)
+static void freeLink( /*@only@*/ struct hardLink * li)
 {
     int i;
 
diff --git a/lib/dbindex.h b/lib/dbindex.h
index 08e654763..20036da00 100644
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -32,20 +32,20 @@ typedef /*@abstract@*/ struct {
 extern "C" {
 #endif
 
-/*@only@*/dbiIndex * dbiOpenIndex(const char * filename, int flags, int perms, DBTYPE type);
-void dbiCloseIndex(/*@only@*/dbiIndex * dbi);
+/*@only@*/ dbiIndex * dbiOpenIndex(const char * filename, int flags, int perms, DBTYPE type);
+void dbiCloseIndex( /*@only@*/ dbiIndex * dbi);
 void dbiSyncIndex(dbiIndex * dbi);
-int dbiSearchIndex(dbiIndex * dbi, const char * str, /*@out@*/dbiIndexSet * set);
+int dbiSearchIndex(dbiIndex * dbi, const char * str, /*@out@*/ dbiIndexSet * set);
    /* -1 error, 0 success, 1 not found */
 int dbiUpdateIndex(dbiIndex * dbi, const char * str, dbiIndexSet * set);
    /* 0 on success */
-int dbiAppendIndexRecord(/*@out@*/dbiIndexSet * set, dbiIndexRecord rec);
+int dbiAppendIndexRecord( /*@out@*/ dbiIndexSet * set, dbiIndexRecord rec);
    /* 0 on success - should never fail */
 int dbiRemoveIndexRecord(dbiIndexSet * set, dbiIndexRecord rec);
    /* 0 on success - fails if rec is not found */
 dbiIndexSet dbiCreateIndexRecord(void);
 void dbiFreeIndexRecord(dbiIndexSet set);
-int dbiGetFirstKey(dbiIndex * dbi, /*@out@*/const char ** key);
+int dbiGetFirstKey(dbiIndex * dbi, /*@out@*/ const char ** key);
 
 extern unsigned int dbiIndexSetCount(dbiIndexSet set);
 
diff --git a/lib/depends.c b/lib/depends.c
index 2cc3af3d4..3f8cdbfbd 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -83,7 +83,7 @@ static void alFreeIndex(struct availableList * al)
     }
 }
 
-static void alCreate(/*@out@*/struct availableList * al)
+static void alCreate( /*@out@*/ struct availableList * al)
 {
     al->alloced = 5;
     al->size = 0;
@@ -94,7 +94,7 @@ static void alCreate(/*@out@*/struct availableList * al)
     alFreeIndex(al);
 }
 
-static void alFree(/*@only@*/struct availableList * al)
+static void alFree( /*@only@*/ struct availableList * al)
 {
     int i;
     rpmRelocation * r;
diff --git a/lib/falloc.h b/lib/falloc.h
index fc9aaad74..40cb94efd 100644
--- a/lib/falloc.h
+++ b/lib/falloc.h
@@ -6,7 +6,7 @@
    uses 32 bit offsets on all platforms and should be byte order independent */
 
 typedef /*@abstract@*/ struct faFile_s {
-    /*@owned@*/FD_t fd;
+    /*@owned@*/ FD_t fd;
     int readOnly;
     unsigned int firstFree;
     unsigned long fileSize;
@@ -22,10 +22,10 @@ extern "C" {
 #endif
 
 /* flags here is the same as for open(2) - NULL returned on error */
-/*@only@*/faFile faOpen(const char * path, int flags, int perms);
+/*@only@*/ faFile faOpen(const char * path, int flags, int perms);
 unsigned int faAlloc(faFile fa, unsigned int size); /* returns 0 on failure */
 void faFree(faFile fa, unsigned int offset);
-void faClose(/*@only@*/faFile fa);
+void faClose( /*@only@*/ faFile fa);
 
 FD_t faFileno(faFile fa);
 off_t faLseek(faFile fa, off_t off, int op);
diff --git a/lib/formats.c b/lib/formats.c
index f88a4889e..daf6c3388 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -154,7 +154,7 @@ static char * depflagsFormat(int_32 type, const void * data,
     return val;
 }
 
-static int fsnamesTag(/*@unused@*/Header h, int_32 * type, void ** data,
+static int fsnamesTag( /*@unused@*/ Header h, int_32 * type, void ** data,
 	int_32 * count, int * freeData)
 {
     const char ** list;
diff --git a/lib/ftp.c b/lib/ftp.c
index ece8ae8ba..79b865ee0 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -425,7 +425,7 @@ errxit:
     return rc;
 }
 
-static int copyData(/*@only@*/FD_t sfd, FD_t tfd) {
+static int copyData( /*@only@*/ FD_t sfd, FD_t tfd) {
     char buf[BUFFER_SIZE];
     fd_set emptySet, readSet;
     struct timeval timeout;
diff --git a/lib/hash.h b/lib/hash.h
index ee95b444f..9d58f219c 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -18,10 +18,10 @@ int hashEqualityString(const void * key1, const void * key2);
 hashTable htCreate(int numBuckets, int keySize, hashFunctionType fn,
 		   hashEqualityType eq); 
 void htAddEntry(hashTable ht, const void * key, const void * data);
-void htFree(/*@only@*/hashTable ht);
+void htFree( /*@only@*/ hashTable ht);
 /* returns 0 on success, 1 if the item is not found. tableKey may be NULL */
-int htGetEntry(hashTable ht, const void * key, /*@out@*/const void *** data, /*@out@*/int * dataCount,
-	       /*@out@*/const void ** tableKey);
+int htGetEntry(hashTable ht, const void * key, /*@out@*/ const void *** data,
+		/*@out@*/ int * dataCount, /*@out@*/const void ** tableKey);
 /* returns 1 if the item is present, 0 otherwise */
 int htHasEntry(hashTable ht, const void * key);
 
diff --git a/lib/header.c b/lib/header.c
index cadb37efb..317281fe3 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -1381,7 +1381,7 @@ static char escapedChar(const char ch)
     }
 }
 
-static void freeFormat(/*@only@*/struct sprintfToken * format, int num)
+static void freeFormat( /*@only@*/ struct sprintfToken * format, int num)
 {
     int i;
 
diff --git a/lib/header.h b/lib/header.h
index d30941d94..03d58d068 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -86,7 +86,7 @@ Header headerLoad(void *p);
 void *headerUnload(Header h);
 
 Header headerNew(void);
-void headerFree(/*@killref@*/ Header h);
+void headerFree( /*@killref@*/ Header h);
 
 /* dump a header to a file, in human readable format */
 void headerDump(Header h, FILE *f, int flags,
@@ -96,7 +96,7 @@ void headerDump(Header h, FILE *f, int flags,
 char * headerSprintf(Header h, const char * fmt,
 		     const struct headerTagTableEntry * tags,
 		     const struct headerSprintfExtension * extentions,
-		     /*@out@*/const char ** error);
+		     /*@out@*/ const char ** error);
 
 #define HEADER_DUMP_INLINE   1
 
@@ -136,14 +136,17 @@ int headerAddOrAppendEntry(Header h, int_32 tag, int_32 type,
 /* Will never return RPM_I18NSTRING_TYPE! RPM_STRING_TYPE elements w/
    RPM_I18NSTRING_TYPE equivalent enreies are translated (if HEADER_I18NTABLE
    entry is present). */
-int headerGetEntry(Header h, int_32 tag, /*@out@*/int_32 *type, /*@out@*/void **p, /*@out@*/int_32 *c);
+int headerGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type,
+	/*@out@*/ void **p, /*@out@*/int_32 *c);
 /* This gets an entry, and uses as little extra RAM as possible to represent
    it (this is only an issue for RPM_STRING_ARRAY_TYPE. */
-int headerGetEntryMinMemory(Header h, int_32 tag, int_32 *type, /*@out@*/void **p, /*@out@*/int_32 *c);
+int headerGetEntryMinMemory(Header h, int_32 tag, int_32 *type,
+	/*@out@*/ void **p, /*@out@*/ int_32 *c);
 
 /* If *type is RPM_NULL_TYPE any type will match, otherwise only *type will
    match. */
-int headerGetRawEntry(Header h, int_32 tag, /*@out@*/int_32 *type, /*@out@*/void **p, /*@out@*/int_32 *c);
+int headerGetRawEntry(Header h, int_32 tag, /*@out@*/ int_32 *type,
+	/*@out@*/ void **p, /*@out@*/ int_32 *c);
 
 int headerIsEntry(Header h, int_32 tag);
 /* removes all entries of type tag from the header, returns 1 if none were
@@ -152,9 +155,9 @@ int headerRemoveEntry(Header h, int_32 tag);
 
 HeaderIterator headerInitIterator(Header h);
 int headerNextIterator(HeaderIterator iter,
-	/*@out@*/int_32 *tag, /*@out@*/int_32 *type, /*@out@*/void **p,
-	/*@out@*/int_32 *c);
-void headerFreeIterator(/*@only@*/ HeaderIterator iter);
+	/*@out@*/ int_32 *tag, /*@out@*/ int_32 *type, /*@out@*/ void **p,
+	/*@out@*/ int_32 *c);
+void headerFreeIterator( /*@only@*/ HeaderIterator iter);
 
 Header headerCopy(Header h);
 void headerSort(Header h);
diff --git a/lib/install.c b/lib/install.c
index fb230ea6a..e2376d9e6 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -82,7 +82,7 @@ static /*@only@*/ struct fileMemory *newFileMemory(void)
     return fileMem;
 }
 
-static void freeFileMemory(/*@only@*/struct fileMemory *fileMem)
+static void freeFileMemory( /*@only@*/ struct fileMemory *fileMem)
 {
     if (fileMem->files) free(fileMem->files);
     if (fileMem->names) free(fileMem->names);
@@ -91,8 +91,8 @@ static void freeFileMemory(/*@only@*/struct fileMemory *fileMem)
 }
 
 /* files should not be preallocated */
-static int assembleFileList(Header h, /*@out@*/struct fileMemory ** memPtr, 
-	 /*@out@*/int * fileCountPtr, /*@out@*/struct fileInfo ** filesPtr, 
+static int assembleFileList(Header h, /*@out@*/ struct fileMemory ** memPtr, 
+	 /*@out@*/ int * fileCountPtr, /*@out@*/ struct fileInfo ** filesPtr, 
 	 int stripPrefixLength, enum fileActions * actions)
 {
     uint_32 * fileFlags;
diff --git a/lib/md5.h b/lib/md5.h
index 07ed7f62c..51bb6b60c 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -23,7 +23,7 @@ typedef /*@abstract@*/ struct MD5Context MD5_CTX;
 extern "C" {
 #endif
 
-void rpmMD5Init(/*@out@*/struct MD5Context *context, int brokenEndian);
+void rpmMD5Init( /*@out@*/ struct MD5Context *context, int brokenEndian);
 void rpmMD5Update(struct MD5Context *context, unsigned char const *buf,
 	       unsigned len);
 void rpmMD5Final(unsigned char digest[16], struct MD5Context *context);
diff --git a/lib/misc.h b/lib/misc.h
index 183891d74..5ee183d14 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -8,8 +8,8 @@
 extern "C" {
 #endif
 
-/*@only@*/char ** splitString(const char * str, int length, char sep);
-void freeSplitString(/*@only@*/char ** list);
+/*@only@*/ char ** splitString(const char * str, int length, char sep);
+void freeSplitString( /*@only@*/ char ** list);
 void stripTrailingSlashes(char * str);
 
 int rpmfileexists(const char * filespec);
@@ -23,14 +23,15 @@ int doputenv(const char * str);
 
 /* These may be called w/ a NULL argument to flush the cache -- they return
    -1 if the user can't be found */
-int unameToUid(char * thisUname, /*@out@*/uid_t * uid);
-int gnameToGid(char * thisGname, /*@out@*/gid_t * gid);
+int unameToUid(char * thisUname, /*@out@*/ uid_t * uid);
+int gnameToGid(char * thisGname, /*@out@*/ gid_t * gid);
 
 /* Call w/ -1 to flush the cache, returns NULL if the user can't be found */
 char * uidToUname(uid_t uid);
 char * gidToGname(gid_t gid);
 
-int makeTempFile(const char * prefix, /*@out@*/const char ** fnptr, /*@out@*/FD_t * fdptr);
+int makeTempFile(const char * prefix, /*@out@*/ const char ** fnptr,
+	/*@out@*/ FD_t * fdptr);
 char * currentDirectory(void);		/* result needs to be freed */
 
 #ifdef __cplusplus
diff --git a/lib/query.c b/lib/query.c
index b35382a1c..c3309a4fc 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -655,9 +655,10 @@ int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg)
 #define POPT_SPECFILE		1006
 
 /* ========== Query/Verify source popt args */
-static void rpmQVSourceArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptCallbackReason reason,
-			     const struct poptOption * opt, /*@unused@*/const char * arg, 
-			     const void * data)
+static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
+	/*@unused@*/ enum poptCallbackReason reason,
+	const struct poptOption * opt, /*@unused@*/ const char * arg, 
+	const void * data)
 {
     QVA_t *qva = (QVA_t *) data;
 
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index b89bb1df8..0072adad4 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -14,11 +14,13 @@
 extern "C" {
 #endif
 
-int rpmReadPackageInfo(FD_t fd, /*@out@*/Header * signatures, /*@out@*/Header * hdr);
-int rpmReadPackageHeader(FD_t fd, /*@out@*/Header * hdr, /*@out@*/int * isSource, /*@out@*/int * major,
-			 /*@out@*/int * minor);
+int rpmReadPackageInfo(FD_t fd, /*@out@*/ Header * signatures,
+	/*@out@*/ Header * hdr);
+int rpmReadPackageHeader(FD_t fd, /*@out@*/ Header * hdr,
+	/*@out@*/ int * isSource, /*@out@*/ int * major, /*@out@*/ int * minor);
 
-int headerNVR(Header h, /*@out@*/const char **np, /*@out@*/const char **vp, /*@out@*/const char **rp);
+int headerNVR(Header h, /*@out@*/ const char **np, /*@out@*/ const char **vp,
+	/*@out@*/ const char **rp);
 
    /* 0 = success */
    /* 1 = bad magic */
@@ -271,15 +273,15 @@ void rpmSetVar(int var, const char *val);
 
 int rpmReadConfigFiles(const char * file, const char * target);
 int rpmReadRC(const char * file);
-void rpmGetArchInfo(/*@out@*/char ** name, /*@out@*/int * num);
-void rpmGetOsInfo(/*@out@*/char ** name, /*@out@*/int * num);
+void rpmGetArchInfo( /*@out@*/ char ** name, /*@out@*/ int * num);
+void rpmGetOsInfo( /*@out@*/ char ** name, /*@out@*/ int * num);
 int rpmMachineScore(int type, char * name);
 int rpmShowRC(FILE *f);
 void rpmSetTables(int archTable, int osTable);  /* only used by build code */
 /* if either are NULL, they are set to the default value (munged uname())
    pushed through a translation table (if appropriate) */
 void rpmSetMachine(const char * arch, const char * os);
-void rpmGetMachine(/*@out@*/char **arch, /*@out@*/char **os);
+void rpmGetMachine( /*@out@*/ char **arch, /*@out@*/ char **os);
 void rpmFreeRpmrc(void);
 
 /** **/
@@ -298,11 +300,11 @@ typedef void * (*rpmCallbackFunction)(const Header h,
 				      const unsigned long total,
 				      const void * pkgKey, void * data);
 
-int rpmdbOpen (const char * root, /*@out@*/rpmdb * dbp, int mode, int perms);
+int rpmdbOpen (const char * root, /*@out@*/ rpmdb * dbp, int mode, int perms);
     /* 0 on error */
 int rpmdbInit(const char * root, int perms);
     /* nonzero on error */
-void rpmdbClose (/*@only@*/rpmdb db);
+void rpmdbClose ( /*@only@*/ rpmdb db);
 /* Databases like this should only have rpmdb*RecNum and rpmdbGetRecord
    used on them. Anything else could fail! */
 int rpmdbOpenForTraversal(const char * prefix, rpmdb * rpmdbp);
@@ -312,17 +314,26 @@ int rpmdbNextRecNum(rpmdb db, unsigned int lastOffset);
     /* 0 at end, -1 on error */
 
 Header rpmdbGetRecord(rpmdb db, unsigned int offset);
-int rpmdbFindByFile(rpmdb db, const char * filespec, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByGroup(rpmdb db, const char * group, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindPackage(rpmdb db, const char * name, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByProvides(rpmdb db, const char * provides, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByRequiredBy(rpmdb db, const char * requires, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByConflicts(rpmdb db, const char * conflicts, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByTriggeredBy(rpmdb db, const char * package, /*@out@*/dbiIndexSet * matches);
+int rpmdbFindByFile(rpmdb db, const char * filespec,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByGroup(rpmdb db, const char * group,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindPackage(rpmdb db, const char * name,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByProvides(rpmdb db, const char * provides,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByRequiredBy(rpmdb db, const char * requires,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByConflicts(rpmdb db, const char * conflicts,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByTriggeredBy(rpmdb db, const char * package,
+	/*@out@*/ dbiIndexSet * matches);
 
 /* these are just convenience functions */
-int rpmdbFindByLabel(rpmdb db, const char * label, /*@out@*/dbiIndexSet * matches);
-int rpmdbFindByHeader(rpmdb db, Header h, /*@out@*/dbiIndexSet * matches);
+int rpmdbFindByLabel(rpmdb db, const char * label,
+	/*@out@*/ dbiIndexSet * matches);
+int rpmdbFindByHeader(rpmdb db, Header h,
+	/*@out@*/ dbiIndexSet * matches);
 
 /* we pass these around as an array with a sentinel */
 typedef struct rpmRelocation_s {
@@ -337,8 +348,8 @@ int rpmInstallSourcePackage(const char * root, FD_t fd, const char ** specFile,
 int rpmVersionCompare(Header first, Header second);
 int rpmdbRebuild(const char * root);
 
-int rpmVerifyFile(const char * root, Header h, int filenum, /*@out@*/int * result,
-		  int omitMask);
+int rpmVerifyFile(const char * root, Header h, int filenum,
+	/*@out@*/ int * result, int omitMask);
 int rpmVerifyScript(const char * root, Header h, FD_t err);
 
 /* Transaction sets are inherently unordered! RPM may reorder transaction
@@ -358,7 +369,8 @@ struct rpmDependencyConflict {
 } ;
 
 /* db may be NULL, but don't do things which require the database! */
-/*@only@*/ rpmTransactionSet rpmtransCreateSet(/*@only@*/rpmdb db, const char * rootdir);
+/*@only@*/ rpmTransactionSet rpmtransCreateSet( /*@only@*/ rpmdb db,
+	const char * rootdir);
 
 /* if fd is NULL, the callback specified in rpmtransCreateSet() is used to
    open and close the file descriptor. If Header is NULL, the fd is always
@@ -371,19 +383,19 @@ int rpmtransAddPackage(rpmTransactionSet rpmdep, Header h, FD_t fd,
 			const void * key, int update, rpmRelocation * relocs);
 void rpmtransAvailablePackage(rpmTransactionSet rpmdep, Header h, void * key);
 void rpmtransRemovePackage(rpmTransactionSet rpmdep, int dboffset);
-void rpmtransFree(/*@only@*/ rpmTransactionSet rpmdep);
+void rpmtransFree( /*@only@*/ rpmTransactionSet rpmdep);
 void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd);
 
 /* this checks for dependency satisfaction, but *not* ordering */
 int rpmdepCheck(rpmTransactionSet rpmdep,
-	/*@exposed@*/ /*@out@*/struct rpmDependencyConflict ** conflicts,
-	/*@exposed@*/ /*@out@*/int * numConflicts);
+	/*@exposed@*/ /*@out@*/ struct rpmDependencyConflict ** conflicts,
+	/*@exposed@*/ /*@out@*/ 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
    satisfied a "best-try" ordering is returned. */
 int rpmdepOrder(rpmTransactionSet order);
-void rpmdepFreeConflicts(/*@only@*/struct rpmDependencyConflict * conflicts,
+void rpmdepFreeConflicts( /*@only@*/ struct rpmDependencyConflict * conflicts,
 	int numConflicts);
 
 #define RPMTRANS_FLAG_TEST		(1 << 0)
@@ -430,11 +442,12 @@ void printDepProblems(FILE *fp, struct rpmDependencyConflict *conflicts,
 void rpmProblemPrint(FILE *fp, rpmProblem prob);
 void rpmProblemSetPrint(FILE *fp, rpmProblemSet probs);
 
-void rpmProblemSetFree(/*@only@*/rpmProblemSet probs);
+void rpmProblemSetFree( /*@only@*/ rpmProblemSet probs);
 
 int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 		       void * notifyData, rpmProblemSet okProbs,
-		       /*@out@*/rpmProblemSet * newProbs, int flags, int ignoreSet);
+		       /*@out@*/ rpmProblemSet * newProbs, int flags,
+			int ignoreSet);
 
 #define RPMPROB_FILTER_IGNOREOS		(1 << 0)
 #define RPMPROB_FILTER_IGNOREARCH	(1 << 1)
@@ -632,9 +645,9 @@ void rpmFreeSignature(Header h);
 int rpmVerifySignature(const char *file, int_32 sigTag, void *sig, int count,
 		       char *result);
 
-int rpmGetFilesystemList(/*@out@*/const char *** listptr, /*@out@*/int * num);
+int rpmGetFilesystemList( /*@out@*/ const char *** listptr, /*@out@*/int * num);
 int rpmGetFilesystemUsage(const char ** filelist, int_32 * fssizes,
-	int numFiles, /*@out@*/uint_32 ** usagesPtr, int flags);
+	int numFiles, /*@out@*/ uint_32 ** usagesPtr, int flags);
 
 /* ==================================================================== */
 /* --- query/verify */
@@ -683,7 +696,7 @@ int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg);
 
 extern struct poptOption rpmVerifyPoptTable[];
 
-int showVerifyPackage(QVA_t *qva, /*@only@*/rpmdb db, Header h);
+int showVerifyPackage(QVA_t *qva, /*@only@*/ rpmdb db, Header h);
 int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg);
 
 /* ==================================================================== */
diff --git a/lib/rpmurl.h b/lib/rpmurl.h
index 51d940fd7..ecf68ec98 100644
--- a/lib/rpmurl.h
+++ b/lib/rpmurl.h
@@ -56,19 +56,19 @@ void	urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCoun
 int	httpOpen(urlinfo *u);
 int	ftpOpen(urlinfo *u);
 
-int	httpGetFile(/*@only@*/FD_t sfd, FD_t tfd);
-int	ftpGetFile(/*@only@*/FD_t sfd, FD_t tfd);
+int	httpGetFile( /*@only@*/ FD_t sfd, FD_t tfd);
+int	ftpGetFile( /*@only@*/ FD_t sfd, FD_t tfd);
 int	ftpGetFileDesc(FD_t);
-int	ftpAbort(/*@only@*/FD_t fd);
-int	ftpClose(/*@only@*/FD_t fd);
+int	ftpAbort( /*@only@*/ FD_t fd);
+int	ftpClose( /*@only@*/ FD_t fd);
 
 urltype	urlIsURL(const char * url);
-int 	urlSplit(const char *url, /*@out@*/urlinfo **u);
-/*@only@*/urlinfo	*newUrlinfo(void);
-void	freeUrlinfo(/*@only@*/urlinfo *u);
+int 	urlSplit(const char *url, /*@out@*/ urlinfo **u);
+/*@only@*/ urlinfo	*newUrlinfo(void);
+void	freeUrlinfo( /*@only@*/ urlinfo *u);
 
 /*@only@*/ FD_t	ufdOpen(const char * pathname, int flags, mode_t mode);
-int	ufdClose(/*@only@*/FD_t fd);
+int	ufdClose( /*@only@*/ FD_t fd);
 const char *urlStrerror(const char *url);
 
 int	urlGetFile(const char * url, const char * dest);
diff --git a/lib/signature.h b/lib/signature.h
index 099ffc0a9..03cedd469 100644
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -38,7 +38,7 @@ extern "C" {
 Header rpmNewSignature(void);
 
 /* If an old-style signature is found, we emulate a new style one */
-int rpmReadSignature(FD_t fd, /*@out@*/Header *header, short sig_type);
+int rpmReadSignature(FD_t fd, /*@out@*/ Header *header, short sig_type);
 int rpmWriteSignature(FD_t fd, Header header);
 
 /* Generate a signature of data in file, insert in header */
@@ -64,7 +64,7 @@ typedef enum pgpVersion_e {
 } pgpVersion;
 
 /* Return path to pgp executable of given type, or NULL when not found */
-const char *rpmDetectPGPVersion(/*@out@*/pgpVersion *pgpVersion);
+const char *rpmDetectPGPVersion( /*@out@*/ pgpVersion *pgpVersion);
 
 #ifdef __cplusplus
 }
diff --git a/po/rpm.pot b/po/rpm.pot
index f74f80f38..9c3fb95f7 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-04 15:16-0400\n"
+"POT-Creation-Date: 1999-10-04 16:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2663,63 +2663,63 @@ msgstr ""
 msgid "rpmQuery: rpmdbOpen() failed\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:693
 msgid "query package owning file"
 msgstr ""
 
-#: lib/query.c:694
+#: lib/query.c:695
 msgid "query packages in group"
 msgstr ""
 
-#: lib/query.c:696
+#: lib/query.c:697
 msgid "query a package file"
 msgstr ""
 
-#: lib/query.c:700
+#: lib/query.c:701
 msgid "query a spec file"
 msgstr ""
 
-#: lib/query.c:702
+#: lib/query.c:703
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/query.c:704
+#: lib/query.c:705
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/query.c:706
+#: lib/query.c:707
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/query.c:745
+#: lib/query.c:746
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/query.c:747
+#: lib/query.c:748
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/query.c:749
+#: lib/query.c:750
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:752
 msgid "list files in package"
 msgstr ""
 
-#: lib/query.c:755
+#: lib/query.c:756
 msgid "use the following query format"
 msgstr ""
 
-#: lib/query.c:757
+#: lib/query.c:758
 msgid "substitute i18n sections from the following catalogue"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:761
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/query.c:762
+#: lib/query.c:763
 msgid "display a verbose file listing"
 msgstr ""
 
diff --git a/rpm.spec b/rpm.spec
index a4617afe0..b26e69820 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.3
 Version: %{version}
-Release: 2.1
+Release: 2.2
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
diff --git a/scripts/getpo.sh b/scripts/getpo.sh
index 5e0b23b22..170463149 100755
--- a/scripts/getpo.sh
+++ b/scripts/getpo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 
 if [ -z "$1" ] ; then