From 3092074460c6caca7139a16dbbc2b528f4eedb98 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Mon, 24 Jul 2000 21:32:01 +0000
Subject: [PATCH] Cosmetic.

CVS patchset: 3977
CVS date: 2000/07/24 21:32:01
---
 CHANGES     | 12 ++++++------
 Doxyfile.in | 38 +++++++++++++++++++++-----------------
 rpm.c       |  2 +-
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/CHANGES b/CHANGES
index df6cf4f..a3de6e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
 3.0.5 -> 4.0
 	- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
-	- configure.in fiddles for BSD systems (Patrick Schoo).
 	- API: change dbi to pass by reference, not value.
 	- cram all of db1, db_185, and db2 interfaces into rpmlib.
 	- convert db1 -> db2 on-disk format using --rebuilddb.
@@ -9,7 +8,6 @@
 	- permit db3 configuration using macros.
 	- create dbi from template rather than passed args.
 	- use hashed access for package headers.
-	- solaris2.6: avoid bsearch with empty dir list (Ric Klaren - klaren@cs.utwente.nl)
 	- db3: save join keys in endian neutral binary format.
 	- treat legacy falloc.c as "special" db[01] index for package headers.
 	- API: pass *SearchIndex() length of key (0 will use strlen(key)).
@@ -31,10 +29,6 @@
 	- fix: free iterator *after* loop, not during.
 	- fix: Depends needed keylen in dbiPut, rpmdbFreeIterator after use.
 	- Rename db0.c to db1.c, resurrect db2.c (from db3.c).
-	- Add ia64 and sparc64 changes.
-	- rpm.spec: add per-platform sub-directories.
-	- FreeBSD fixes (bero@redhat.com).
-	- include RPM-GPG-KEY in file manifest.
 	- simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
 	- fix: alloca'd memory used outside of scope (alpha segfault).
 	- fix: define/eval options assumed sizeof(int) == sizeof(void *).
@@ -89,6 +83,12 @@
 	- fix: don't attempt dbiOpen with anything but requested dbN.
 
 3.0.4 -> 3.0.5
+	- configure.in fiddles for BSD systems (Patrick Schoo).
+	- solaris2.6: avoid bsearch with empty dir list (Ric Klaren - klaren@cs.utwente.nl)
+	- include RPM-GPG-KEY in file manifest.
+	- Add ia64 and sparc64 changes.
+	- rpm.spec: add per-platform sub-directories.
+	- FreeBSD fixes (bero@redhat.com).
 	- handle version 4 packaging as input.
 	- builds against bzip2 1.0
 	- fix: resurrect symlink unique'ifying property of finger prints.
diff --git a/Doxyfile.in b/Doxyfile.in
index b76fdab..e6589d4 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -180,9 +180,7 @@ INPUT                = \
 	./build.c \
 	./build.h \
 	./config.h \
-	./convertdb.c \
-	./oldrpmdb.c \
-	./rpm.c \
+	./rpmqv.c \
 	./rpm2cpio.c \
 	./system.h \
 	./build/build.c \
@@ -209,7 +207,7 @@ INPUT                = \
 	./build/spec.c \
 	./lib/cpio.c \
 	./lib/cpio.h \
-	./lib/db0.c \
+	./lib/db1.c \
 	./lib/db3.c \
 	./lib/depends.c \
 	./lib/depends.h \
@@ -225,34 +223,26 @@ INPUT                = \
 	./lib/header.h \
 	./lib/install.c \
 	./lib/install.h \
-	./lib/macro.c \
 	./lib/md5.c \
 	./lib/md5.h \
 	./lib/md5sum.c \
-	./lib/messages.c \
 	./lib/misc.c \
 	./lib/misc.h \
-	./lib/oldheader.c \
-	./lib/oldheader.h \
-	./lib/oldrpmdb.h \
 	./lib/package.c \
+	./lib/poptBT.c \
+	./lib/poptQV.c \
 	./lib/problems.c \
 	./lib/query.c \
+	./lib/rpm_malloc.h \
 	./lib/rpmchecksig.c \
 	./lib/rpmdb.c \
 	./lib/rpmdb.h \
-	./lib/rpmerr.c \
 	./lib/rpminstall.c \
-	./lib/rpmio.c \
-	./lib/rpmio.h \
 	./lib/rpmlead.c \
 	./lib/rpmlead.h \
 	./lib/rpmlib.h \
-	./lib/rpmmacro.h \
-	./lib/rpmmalloc.c \
-	./lib/rpm_malloc.h \
+	./lib/rpmlibprov.c \
 	./lib/rpmrc.c \
-	./lib/rpmurl.h \
 	./lib/signature.c \
 	./lib/signature.h \
 	./lib/stringbuf.c \
@@ -262,8 +252,22 @@ INPUT                = \
 	./lib/tagtable.c \
 	./lib/transaction.c \
 	./lib/uninstall.c \
-	./lib/url.c \
 	./lib/verify.c \
+	./rpmio/macro.c \
+	./rpmio/messages.c \
+	./rpmio/rpmerr.c \
+	./rpmio/rpmerr.h \
+	./rpmio/rpmio.c \
+	./rpmio/rpmio.h \
+	./rpmio/rpmio_api.c \
+	./rpmio/rpmmacro.h \
+	./rpmio/rpmmalloc.c \
+	./rpmio/rpmmessages.h \
+	./rpmio/rpmrpc.c \
+	./rpmio/rpmurl.h \
+	./rpmio/ugid.c \
+	./rpmio/ugid.h \
+	./rpmio/url.c \
 	./popt/findme.c \
 	./popt/findme.h \
 	./popt/popt.c \
diff --git a/rpm.c b/rpm.c
index 3fbb3d8..0a22246 100755
--- a/rpm.c
+++ b/rpm.c
@@ -110,7 +110,7 @@ static struct poptOption optionsTable[] = {
  { "excludedocs", '\0', 0, &excldocs, 0,	NULL, NULL},
  { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,	NULL, NULL},
  { "force", '\0', 0, &force, 0,			NULL, NULL},
-{ "freshen", 'F', 0, 0, 'F',			NULL, NULL},
+ { "freshen", 'F', 0, 0, 'F',			NULL, NULL},
  { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1,		NULL, NULL},
  { "hash", 'h', 0, &showHash, 0,		NULL, NULL},
  { "help", '\0', 0, &help, 0,			NULL, NULL},
-- 
2.7.4