diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-15 13:22:19 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-15 13:22:19 +0200 |
commit | 2d5b4e3bace86d9eea9024ca55de941fec2acc6f (patch) | |
tree | 880132cbf371c7d6c946e69d5efd3c58cbcc00b3 /lib | |
parent | 21c34a30eb1d8de4a66a9b4d0ec5e1b38cac4568 (diff) | |
download | librpm-tizen-2d5b4e3bace86d9eea9024ca55de941fec2acc6f.tar.gz librpm-tizen-2d5b4e3bace86d9eea9024ca55de941fec2acc6f.tar.bz2 librpm-tizen-2d5b4e3bace86d9eea9024ca55de941fec2acc6f.zip |
Lose useless fsm/rpmfi astriplen field
- only "used" for debugging output, duh...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fsm.c | 5 | ||||
-rw-r--r-- | lib/fsm.h | 1 | ||||
-rw-r--r-- | lib/rpmfi_internal.h | 1 |
3 files changed, 1 insertions, 6 deletions
@@ -622,13 +622,10 @@ static int fsmMapPath(FSM_t fsm) fsm->osuffix = NULL; fsm->nsuffix = NULL; - fsm->astriplen = 0; fsm->action = FA_UNKNOWN; i = fsm->ix; if (fi && i >= 0 && i < fi->fc) { - - fsm->astriplen = fi->astriplen; fsm->action = (fi->actions ? fi->actions[i] : fi->action); fsm->fflags = (fi->fflags ? fi->fflags[i] : fi->flags); @@ -1346,7 +1343,7 @@ static int fsmStage(FSM_t fsm, fileStage stage) cur, (unsigned)st->st_mode, (int)st->st_nlink, (int)st->st_uid, (int)st->st_gid, (int)st->st_size, - (fsm->path ? fsm->path + fsm->astriplen : ""), + (fsm->path ? fsm->path : ""), _fafilter(fsm->action)); } #undef _fafilter @@ -147,7 +147,6 @@ struct fsm_s { int diskchecked; /*!< Has stat(2) been performed? */ int exists; /*!< Does current file exist on disk? */ int mkdirsdone; /*!< Have "orphan" dirs been created? */ - int astriplen; /*!< Length of buildroot prefix. */ int rc; /*!< External file stage return code. */ int commit; /*!< Commit synchronously? */ cpioMapFlags mapFlags; /*!< Bit(s) to control mapping. */ diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h index 93f5bfbaf..ec82d2348 100644 --- a/lib/rpmfi_internal.h +++ b/lib/rpmfi_internal.h @@ -97,7 +97,6 @@ struct rpmfi_s { char * fn; /*!< File name buffer. */ - size_t astriplen; size_t striplen; rpm_loff_t archiveSize; const char ** apath; |