move ensureOlder() -> rpmEnsureOlder(), and make it public

CVS patchset: 913
CVS date: 1996/07/22 18:32:03

diff --git a/lib/install.c b/lib/install.c
index 5bccac9..1c0cd8c 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -59,8 +59,6 @@ static int instHandleSharedFiles(rpmdb db, int ignoreOffset, char ** fileList,
 static int fileCompare(const void * one, const void * two);
 static int installSources(char * rootdir, int fd, char ** specFilePtr);
 static int markReplacedFiles(rpmdb db, struct replacedFile * replList);
-static int ensureOlder(rpmdb db, char * name, char * newVersion, 
-                      char * newRelease, int dbOffset);
 static int relocateFilelist(Header * hp, char * defaultPrefix, 
                        char * newPrefix, int * relocationSize);
 static int archOkay(Header h);
@@ -232,7 +230,7 @@ int rpmInstallPackage(char * rootdir, rpmdb db, int fd, char * location,
            for (i = 0; i < matches.count; i++) {
                if (matches.recs[i].recOffset != otherOffset) {
                    if (!(flags & INSTALL_UPGRADETOOLD)) 
-                       if (ensureOlder(db, name, version, release, 
+                       if (rpmEnsureOlder(db, name, version, release, 
                                        matches.recs[i].recOffset)) 
                            return 2;
                    *intptr++ = matches.recs[i].recOffset;
@@ -1335,8 +1333,8 @@ static int markReplacedFiles(rpmdb db, struct replacedFile * replList) {
     return 0;
 }
 
-static int ensureOlder(rpmdb db, char * name, char * newVersion, 
-                      char * newRelease, int dbOffset) {
+int rpmEnsureOlder(rpmdb db, char * name, char * newVersion, 
+                  char * newRelease, int dbOffset) {
     Header h;
     char * oldVersion, * oldRelease;
     int rc, result;

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 0eeb171..2d94e9c 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -204,6 +204,8 @@ int rpmOsScore(char * arch);
 int rpmInstallSourcePackage(char * prefix, int fd, char ** specFile);
 int rpmInstallPackage(char * rootdir, rpmdb db, int fd, char * prefix, 
                     int flags, notifyFunction notify, char * labelFormat);
+int rpmEnsureOlder(rpmdb db, char * name, char * newVersion, 
+               char * newRelease, int dbOffset);
 int rpmRemovePackage(char * prefix, rpmdb db, unsigned int offset, int test);
 int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant);
 int rpmdbAdd(rpmdb db, Header dbentry);