Lose useless fsm/rpmfi astriplen field

- only "used" for debugging output, duh...
This commit is contained in:
Panu Matilainen 2008-11-15 13:22:19 +02:00
parent 21c34a30eb
commit 2d5b4e3bac
4 changed files with 1 additions and 9 deletions

View File

@ -1266,9 +1266,6 @@ static void genCpioListAndHeader(FileList fl,
a = (char *)(fi->apath + fi->fc);
*a = '\0';
fi->astriplen = 0;
if (fl->buildRoot)
fi->astriplen = strlen(fl->buildRoot);
fi->striplen = 0;
/* Make the cpio list */

View File

@ -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

View File

@ -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. */

View File

@ -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;