diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/rpmal.c | 5 | ||||
| -rw-r--r-- | lib/rpmal.h | 11 | ||||
| -rw-r--r-- | lib/rpmlegacy.h | 1 | ||||
| -rw-r--r-- | lib/rpmts.c | 2 | ||||
| -rw-r--r-- | lib/rpmts_internal.h | 2 | ||||
| -rw-r--r-- | lib/rpmtypes.h | 2 | ||||
| -rw-r--r-- | preinstall.am | 4 |
9 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 4b2675193..7daf96f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,7 +57,6 @@ pkginclude_HEADERS += lib/rpmdb.h pkginclude_HEADERS += lib/rpmcallback.h pkginclude_HEADERS += lib/rpmcli.h pkginclude_HEADERS += lib/rpmlib.h -pkginclude_HEADERS += lib/rpmal.h pkginclude_HEADERS += lib/rpmds.h pkginclude_HEADERS += lib/rpmfi.h pkginclude_HEADERS += lib/rpmgi.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 8d317f2ba..cd01d2748 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -27,7 +27,7 @@ librpm_la_SOURCES = \ cpio.c cpio.h depends.c formats.c tagexts.c fs.c fsm.c fsm.h \ manifest.c manifest.h misc.c package.c \ poptALL.c poptI.c poptQV.c psm.c psm.h query.c \ - rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpmfi_internal.h rpmgi.c \ + rpmal.c rpmal.h rpmchecksig.c rpmds.c rpmfi.c rpmfi_internal.h rpmgi.c \ rpminstall.c rpmts_internal.h \ rpmlead.c rpmlead.h rpmps.c rpmrc.c \ rpmte.c rpmte_internal.h rpmts.c \ diff --git a/lib/rpmal.c b/lib/rpmal.c index 7abf60a36..ee7abb72b 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -5,11 +5,12 @@ #include "system.h" -#include <rpm/rpmal.h> #include <rpm/rpmds.h> #include <rpm/rpmte.h> #include <rpm/rpmfi.h> -#include "rpmhash.h" + +#include "lib/rpmal.h" +#include "lib/rpmhash.h" #include "debug.h" diff --git a/lib/rpmal.h b/lib/rpmal.h index 92d6daa4f..ffa9d5bf7 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -14,12 +14,16 @@ extern "C" { extern int _rpmal_debug; +typedef struct rpmal_s * rpmal; +typedef void * rpmalKey; + /** * Initialize available packckages, items, and directory list. * @param delta no. of entries to add on each realloc * @param tscolor transaction color bits * @return al new available list */ +RPM_GNUC_INTERNAL rpmal rpmalCreate(int delta, rpm_color_t tscolor); /** @@ -27,6 +31,7 @@ rpmal rpmalCreate(int delta, rpm_color_t tscolor); * @param al available list * @return NULL always */ +RPM_GNUC_INTERNAL rpmal rpmalFree(rpmal al); /** @@ -34,6 +39,7 @@ rpmal rpmalFree(rpmal al); * @param al available list * @param p package */ +RPM_GNUC_INTERNAL void rpmalDel(rpmal al, rpmte p); /** @@ -42,6 +48,7 @@ void rpmalDel(rpmal al, rpmte p); * @param p package * @return available package index */ +RPM_GNUC_INTERNAL void rpmalAdd(rpmal al, rpmte p); @@ -49,6 +56,7 @@ void rpmalAdd(rpmal al, * Generate index for available list. * @param al available list */ +RPM_GNUC_INTERNAL void rpmalMakeIndex(rpmal al); /** @@ -57,6 +65,7 @@ void rpmalMakeIndex(rpmal al); * @param ds dependency set * @return associated package(s), NULL if none */ +RPM_GNUC_INTERNAL rpmte * rpmalAllFileSatisfiesDepend(const rpmal al, const rpmds ds); /** @@ -66,6 +75,7 @@ rpmte * rpmalAllFileSatisfiesDepend(const rpmal al, const rpmds ds); * @retval keyp added package key pointer (or NULL) * @return associated package(s), NULL if none */ +RPM_GNUC_INTERNAL rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds); /** @@ -75,6 +85,7 @@ rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds); * @param ds dependency set * @return associated package key, NULL if none */ +RPM_GNUC_INTERNAL rpmte rpmalSatisfiesDepend(const rpmal al, const rpmds ds); #ifdef __cplusplus diff --git a/lib/rpmlegacy.h b/lib/rpmlegacy.h index bddd8492d..29a12eeec 100644 --- a/lib/rpmlegacy.h +++ b/lib/rpmlegacy.h @@ -28,7 +28,6 @@ typedef const void * hPTR_t RPM_GNUC_DEPRECATED; typedef rpm_count_t * hCNT_t RPM_GNUC_DEPRECATED; typedef rpmSpec Spec RPM_GNUC_DEPRECATED; -typedef rpmalKey alKey RPM_GNUC_DEPRECATED; /* legacy header interfaces */ diff --git a/lib/rpmts.c b/lib/rpmts.c index bfe49a22f..64fb7adef 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -15,13 +15,13 @@ #include <rpm/rpmkeyring.h> #include <rpm/rpmdb.h> -#include <rpm/rpmal.h> #include <rpm/rpmds.h> #include <rpm/rpmfi.h> #include <rpm/rpmlog.h> #include <rpm/rpmte.h> #include "rpmio/digest.h" +#include "lib/rpmal.h" #include "lib/rpmlock.h" #include "lib/rpmts_internal.h" #include "lib/misc.h" diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h index d2e28c74d..e85f05b69 100644 --- a/lib/rpmts_internal.h +++ b/lib/rpmts_internal.h @@ -2,8 +2,8 @@ #define _RPMTS_INTERNAL_H #include <rpm/rpmts.h> -#include <rpm/rpmal.h> /* XXX availablePackage */ +#include "lib/rpmal.h" /* XXX availablePackage */ #include "lib/rpmhash.h" /* XXX hashTable */ #include "lib/fprint.h" diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h index 1930322fd..99a28e226 100644 --- a/lib/rpmtypes.h +++ b/lib/rpmtypes.h @@ -62,8 +62,6 @@ typedef struct rpmds_s * rpmds; typedef struct rpmfi_s * rpmfi; typedef struct rpmdb_s * rpmdb; typedef struct rpmdbMatchIterator_s * rpmdbMatchIterator; -typedef struct rpmal_s * rpmal; -typedef void * rpmalKey; typedef const void * fnpyKey; typedef void * rpmCallbackData; /** @} */ diff --git a/preinstall.am b/preinstall.am index b063b164b..d79a9f014 100644 --- a/preinstall.am +++ b/preinstall.am @@ -66,10 +66,6 @@ include/rpm/rpmlib.h: lib/rpmlib.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/lib/rpmlib.h include/rpm/rpmlib.h BUILT_SOURCES += include/rpm/rpmlib.h CLEANFILES += include/rpm/rpmlib.h -include/rpm/rpmal.h: lib/rpmal.h include/rpm/$(dirstamp) - $(INSTALL_DATA) $(top_srcdir)/lib/rpmal.h include/rpm/rpmal.h -BUILT_SOURCES += include/rpm/rpmal.h -CLEANFILES += include/rpm/rpmal.h include/rpm/rpmds.h: lib/rpmds.h include/rpm/$(dirstamp) $(INSTALL_DATA) $(top_srcdir)/lib/rpmds.h include/rpm/rpmds.h BUILT_SOURCES += include/rpm/rpmds.h |