summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-04-17 17:36:47 +0300
committerPanu Matilainen <pmatilai@redhat.com>2012-04-17 17:36:47 +0300
commitf1d24281f5d4c48c95709b96bb1d3ea3dbdb22a9 (patch)
treeab67ca9ba8fca444a07802d71c4080ae01adfdb8
parentfa483f1762ad13c665f111b7993fcace97814fc6 (diff)
downloadrpm-f1d24281f5d4c48c95709b96bb1d3ea3dbdb22a9.tar.gz
rpm-f1d24281f5d4c48c95709b96bb1d3ea3dbdb22a9.tar.bz2
rpm-f1d24281f5d4c48c95709b96bb1d3ea3dbdb22a9.zip
Kill couple of useless "helper" functions
- Both are only ever called once and are so trivial that they're not helping anything at all
-rw-r--r--lib/fsm.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/fsm.c b/lib/fsm.c
index a0a77f75a..57032f570 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -314,20 +314,6 @@ static DNLI_t dnlFreeIterator(DNLI_t dnli)
}
/** \ingroup payload
- */
-static inline int dnlCount(const DNLI_t dnli)
-{
- return (dnli ? rpmfiDC(dnli->fi) : 0);
-}
-
-/** \ingroup payload
- */
-static inline int dnlIndex(const DNLI_t dnli)
-{
- return (dnli ? dnli->isave : -1);
-}
-
-/** \ingroup payload
* Create directory name iterator.
* @param fi file info set
* @param fs file state set
@@ -1290,7 +1276,7 @@ static int fsmMkdirs(rpmfi fi, rpmfs fs, struct selabel_handle *sehandle)
DNLI_t dnli = dnlInitIterator(fi, fs, 0);
struct stat sb;
const char *dpath;
- int dc = dnlCount(dnli);
+ int dc = rpmfiDC(fi);
int rc = 0;
int i;
int ldnlen = 0;
@@ -1305,7 +1291,7 @@ static int fsmMkdirs(rpmfi fi, rpmfs fs, struct selabel_handle *sehandle)
size_t dnlen = strlen(dpath);
char * te, dn[dnlen+1];
- dc = dnlIndex(dnli);
+ dc = dnli->isave;
if (dc < 0) continue;
dnlx[dc] = dnlen;
if (dnlen <= 1)