diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-18 16:33:07 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-18 16:33:07 +0200 |
commit | f41bd90c2ac156e459e7af368481471b701ed887 (patch) | |
tree | 1181b1de6812f5626e25c82e98fac4c238378155 /lib | |
parent | 937d814328caba4383b8c3c71265268bb9797840 (diff) | |
download | rpm-f41bd90c2ac156e459e7af368481471b701ed887.tar.gz rpm-f41bd90c2ac156e459e7af368481471b701ed887.tar.bz2 rpm-f41bd90c2ac156e459e7af368481471b701ed887.zip |
Nuke useless rpmfiFContext()
- it only ever returns NULLs because there are no security contexts in
headers (and having them in headers make no sense as the context varies
based on whatever selinux policy happens to be active on the target
system)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rpmfi.c | 11 | ||||
-rw-r--r-- | lib/rpmfi.h | 7 | ||||
-rw-r--r-- | lib/rpmfi_internal.h | 3 |
3 files changed, 0 insertions, 21 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 37cedfa86..97ababed1 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -299,17 +299,6 @@ const char * rpmfiFClass(rpmfi fi) return fclass; } -const char * rpmfiFContext(rpmfi fi) -{ - const char * fcontext = NULL; - - if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { - if (fi->fcontexts != NULL) - fcontext = fi->fcontexts[fi->i]; - } - return fcontext; -} - uint32_t rpmfiFDepends(rpmfi fi, const uint32_t ** fddictp) { int fddictx = -1; diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 7755a7125..7bee44ff4 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -284,13 +284,6 @@ rpm_color_t rpmfiFColor(rpmfi fi); const char * rpmfiFClass(rpmfi fi); /** \ingroup rpmfi - * Return current file security context from file info set. - * @param fi file info set - * @return current file context, 0 on invalid - */ -const char * rpmfiFContext(rpmfi fi); - -/** \ingroup rpmfi * Return current file depends dictionary from file info set. * @param fi file info set * @retval *fddictp file depends dictionary array (or NULL) diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h index cf9a6aad6..3eb7b524b 100644 --- a/lib/rpmfi_internal.h +++ b/lib/rpmfi_internal.h @@ -58,9 +58,6 @@ struct rpmfi_s { char * fstates; /*!< File state(s) (from header) */ const rpm_color_t * fcolors;/*!< File color bits (header) */ - - const char ** fcontexts; /*! FIle security contexts. */ - const char ** fcaps; /*! File capabilities (header) */ const char ** cdict; /*!< File class dictionary (header) */ |