folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename public fileAction* type to rpmFileAction for namespacing

This commit is contained in:
Panu Matilainen 2007-09-20 16:19:25 +03:00
parent a5aa5ffce8
commit c0149602a6
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fsm.c
View File

@ -2224,7 +2224,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
return rc;
}
const char * fileActionString(fileAction a)
const char * fileActionString(rpmFileAction a)
{
switch (a) {
case FA_UNKNOWN: return "unknown";

4
lib/fsm.h
View File

@ -162,7 +162,7 @@ struct fsm_s {
const char * fcontext; /*!< File security context (NULL disables). */
unsigned fflags; /*!< File flags. */
fileAction action; /*!< File disposition. */
rpmFileAction action; /*!< File disposition. */
fileStage goal; /*!< Package state machine goal. */
fileStage stage; /*!< External file stage. */
fileStage nstage; /*!< Next file stage. */
@ -186,7 +186,7 @@ const char * fileStageString(fileStage a) ;
* @param a file dispostion
* @return formatted string
*/
const char * fileActionString(fileAction a) ;
const char * fileActionString(rpmFileAction a) ;
/**
* Create file state machine instance.

4
lib/psm.c
View File

@ -1656,8 +1656,8 @@ psm->te->h = headerLink(fi->h);
}
if (psm->goal == PSM_PKGSAVE) {
fileAction * actions = fi->actions;
fileAction action = fi->action;
rpmFileAction * actions = fi->actions;
rpmFileAction action = fi->action;
fi->action = FA_COPYOUT;
fi->actions = NULL;

4
lib/rpmfi.c
View File

@ -473,7 +473,7 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi)
return 0;
}
fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
{
const char * fn = rpmfiFN(nfi);
int newFlags = rpmfiFFlags(nfi);
@ -619,7 +619,7 @@ const char * rpmfiTypeString(rpmfi fi)
*/
static
Header relocateFileList(const rpmts ts, rpmfi fi,
Header origH, fileAction * actions)
Header origH, rpmFileAction * actions)
{
rpmte p = rpmtsRelocateElement(ts);
HGE_t hge = fi->hge;

6
lib/rpmfi.h
View File

@ -93,8 +93,8 @@ struct rpmfi_s {
uid_t uid; /*!< File uid (default). */
gid_t gid; /*!< File gid (default). */
uint_32 flags; /*!< File flags (default). */
fileAction action; /*!< File disposition (default). */
fileAction * actions; /*!< File disposition(s). */
rpmFileAction action; /*!< File disposition (default). */
rpmFileAction * actions; /*!< File disposition(s). */
struct fingerPrint_s * fps; /*!< File fingerprint(s). */
const char ** obnl; /*!< Original basename(s) (from header) */
const char ** odnl; /*!< Original dirname(s) (from header) */
@ -466,7 +466,7 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi);
* @param skipMissing OK to skip missing files?
* @return file dispostion
*/
fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing);
rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing);
/**
* Return whether file is conflicting config

4
lib/rpmlib.h
View File

@ -750,7 +750,7 @@ int rpmVersionCompare(Header first, Header second);
/**
* File disposition(s) during package install/erase transaction.
*/
typedef enum fileAction_e {
typedef enum rpmFileAction_e {
FA_UNKNOWN = 0, /*!< initial action for file ... */
FA_CREATE, /*!< ... copy in from payload. */
FA_COPYIN, /*!< ... copy in from payload. */
@ -763,7 +763,7 @@ typedef enum fileAction_e {
FA_SKIPNSTATE, /*!< ... untouched, state "not installed". */
FA_SKIPNETSHARED, /*!< ... untouched, state "netshared". */
FA_SKIPCOLOR /*!< ... untouched, state "wrong color". */
} fileAction;
} rpmFileAction;
#define XFA_SKIPPING(_a) \
((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED || (_a) == FA_SKIPCOLOR)

2
lib/rpmts.c
View File

@ -1177,7 +1177,7 @@ int rpmtsInitDSI(const rpmts ts)
void rpmtsUpdateDSI(const rpmts ts, dev_t dev,
uint_32 fileSize, uint_32 prevSize, uint_32 fixupSize,
fileAction action)
rpmFileAction action)
{
rpmDiskSpaceInfo dsi;
uint_32 bneeded;

2
lib/rpmts.h
View File

@ -710,7 +710,7 @@ int rpmtsInitDSI(const rpmts ts);
*/
void rpmtsUpdateDSI(const rpmts ts, dev_t dev,
uint_32 fileSize, uint_32 prevSize, uint_32 fixupSize,
fileAction action);
rpmFileAction action);
/** \ingroup rpmts
* Check a transaction element for disk space problems.

4
lib/transaction.c
View File

@ -203,7 +203,7 @@ static int handleInstInstalledFiles(const rpmts ts,
if (isCfgFile) {
int skipMissing =
((rpmtsFlags(ts) & RPMTRANS_FLAG_ALLFILES) ? 0 : 1);
fileAction action = rpmfiDecideFate(otherFi, fi, skipMissing);
rpmFileAction action = rpmfiDecideFate(otherFi, fi, skipMissing);
fi->actions[fileNum] = action;
}
fi->replacedSizes[fileNum] = rpmfiFSize(otherFi);
@ -2004,7 +2004,7 @@ assert(psm != NULL);
psm->fi = rpmfiFree(psm->fi);
{
char * fstates = fi->fstates;
fileAction * actions = fi->actions;
rpmFileAction * actions = fi->actions;
sharedFileInfo replaced = fi->replaced;
int mapflags = fi->mapflags;
rpmte savep;