summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-09-21 11:40:49 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-09-21 11:40:49 +0300
commit42bcdfd52788ee979bd0a0f7e137b6d85fc74fcc (patch)
treed415bf1e58a8d8d6cff40eefb90dab45151abed8
parent8f7874c1933fc1dff36685d13abfedda56ca9ab7 (diff)
downloadrpm-42bcdfd52788ee979bd0a0f7e137b6d85fc74fcc.tar.gz
rpm-42bcdfd52788ee979bd0a0f7e137b6d85fc74fcc.tar.bz2
rpm-42bcdfd52788ee979bd0a0f7e137b6d85fc74fcc.zip
Rename specdFlags to remove unnecessary type vs variable name confusion
-rw-r--r--build/files.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/files.c b/build/files.c
index 5b1a8d1d8..52b114ba7 100644
--- a/build/files.c
+++ b/build/files.c
@@ -37,7 +37,7 @@
/**
*/
-enum specdFlags_e {
+enum specfFlags_e {
SPECD_DEFFILEMODE = (1 << 0),
SPECD_DEFDIRMODE = (1 << 1),
SPECD_DEFUID = (1 << 2),
@@ -51,7 +51,7 @@ enum specdFlags_e {
SPECD_VERIFY = (1 << 12)
};
-typedef rpmFlags specdFlags;
+typedef rpmFlags specfFlags;
/**
*/
@@ -72,7 +72,7 @@ typedef struct FileListRec_s {
const char *uname;
const char *gname;
unsigned flags;
- specdFlags specdFlags; /* which attributes have been explicitly specified. */
+ specfFlags specdFlags; /* which attributes have been explicitly specified. */
rpmVerifyFlags verifyFlags;
char *langs; /* XXX locales separated with | */
char *caps;
@@ -114,11 +114,11 @@ typedef struct FileList_s {
int isDir;
rpmBuildPkgFlags pkgFlags;
rpmfileAttrs currentFlags;
- specdFlags currentSpecdFlags;
+ specfFlags currentSpecdFlags;
rpmVerifyFlags currentVerifyFlags;
struct AttrRec_s cur_ar;
struct AttrRec_s def_ar;
- specdFlags defSpecdFlags;
+ specfFlags defSpecdFlags;
rpmVerifyFlags defVerifyFlags;
int nLangs;
char ** currentLangs;
@@ -266,7 +266,7 @@ static rpmRC parseForVerify(const char * buf, FileList fl)
rpmVerifyFlags *resultVerify;
int negated;
rpmVerifyFlags verifyFlags;
- specdFlags * specdFlags;
+ specfFlags * specdFlags;
rpmRC rc = RPMRC_FAIL;
if ((p = strstr(buf, (name = "%verify"))) != NULL) {
@@ -459,7 +459,7 @@ static rpmRC parseForAttr(const char * buf, FileList fl)
int x;
struct AttrRec_s arbuf;
AttrRec ar = &arbuf, ret_ar;
- specdFlags * specdFlags;
+ specfFlags * specdFlags;
rpmRC rc = RPMRC_FAIL;
if ((p = strstr(buf, (name = "%attr"))) != NULL) {