diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2008-01-30 12:21:59 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2008-01-30 12:21:59 +0200 |
commit | 78f1f6378e3d18c1b46dc22125c6d3e0808f26af (patch) | |
tree | aecfce2200b86f34f214a23a6556b1cc6e59c419 /lib | |
parent | 90fbda71036fe0614558750fb4fa862c3b8f1413 (diff) | |
download | rpm-78f1f6378e3d18c1b46dc22125c6d3e0808f26af.tar.gz rpm-78f1f6378e3d18c1b46dc22125c6d3e0808f26af.tar.bz2 rpm-78f1f6378e3d18c1b46dc22125c6d3e0808f26af.zip |
Stick relocation struct to rpmfi, typedef to rpmtypes...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rpmfi.h | 8 | ||||
-rw-r--r-- | lib/rpmlib.h | 8 | ||||
-rw-r--r-- | lib/rpmtypes.h | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/lib/rpmfi.h b/lib/rpmfi.h index f7c975bff..40262806f 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -86,6 +86,14 @@ typedef enum rpmFileAction_e { #define XFA_SKIPPING(_a) \ ((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED || (_a) == FA_SKIPCOLOR) +/** + * We pass these around as an array with a sentinel. + */ +struct rpmRelocation_s { + const char * oldPath; /*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */ + const char * newPath; /*!< NULL means to omit the file completely! */ +}; + /** \ingroup rpmfi * Unreference a file info set instance. * @param fi file info set diff --git a/lib/rpmlib.h b/lib/rpmlib.h index c5690e3e2..20dc180bb 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -201,14 +201,6 @@ typedef int (*HME_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type, typedef int (*HRE_t) (Header h, rpm_tag_t tag); /** - * We pass these around as an array with a sentinel. - */ -typedef struct rpmRelocation_s { - const char * oldPath; /*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */ - const char * newPath; /*!< NULL means to omit the file completely! */ -} rpmRelocation; - -/** * Compare headers to determine which header is "newer". * @param first 1st header * @param second 2nd header diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h index 813ce6e84..3ec1df133 100644 --- a/lib/rpmtypes.h +++ b/lib/rpmtypes.h @@ -38,6 +38,7 @@ typedef struct rpmgi_s * rpmgi; typedef struct rpmSpec_s * rpmSpec; typedef const void * fnpyKey; +typedef struct rpmRelocation_s rpmRelocation; typedef struct _FD_s * FD_t; |