diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-09-21 14:55:03 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-09-21 14:55:03 +0300 |
| commit | b9cd5a5e746d1bb0da5d6ccef8d83e7867569168 (patch) | |
| tree | f5353e0e52ca95a53eee7d4381deafacfa3966bb /lib/rpmte.c | |
| parent | 5d79b79c1b2d33196073c9e7b841b52816d46532 (diff) | |
| download | rpm-b9cd5a5e746d1bb0da5d6ccef8d83e7867569168.tar.gz rpm-b9cd5a5e746d1bb0da5d6ccef8d83e7867569168.tar.bz2 rpm-b9cd5a5e746d1bb0da5d6ccef8d83e7867569168.zip | |
Avoid stepping on toes of relatives, part 1
- Eliminate uses of "this" which is a reserved keyword in C++
Diffstat (limited to 'lib/rpmte.c')
| -rw-r--r-- | lib/rpmte.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rpmte.c b/lib/rpmte.c index 8a566010b..976be60e1 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -40,7 +40,7 @@ struct rpmte_s { unsigned int db_instance; /*!< Database instance (of removed pkgs) */ tsortInfo tsi; /*!< Dependency ordering chains. */ - rpmds this; /*!< This package's provided NEVR. */ + rpmds thisds; /*!< This package's provided NEVR. */ rpmds provides; /*!< Provides: dependencies. */ rpmds requires; /*!< Requires: dependencies. */ rpmds conflicts; /*!< Conflicts: dependencies. */ @@ -77,7 +77,7 @@ static int rpmteClose(rpmte te, int reset_fi); void rpmteCleanDS(rpmte te) { - te->this = rpmdsFree(te->this); + te->thisds = rpmdsFree(te->thisds); te->provides = rpmdsFree(te->provides); te->requires = rpmdsFree(te->requires); te->conflicts = rpmdsFree(te->conflicts); @@ -219,7 +219,7 @@ static void addTE(rpmte p, Header h, fnpyKey key, rpmRelocation * relocs) p->pkgFileSize = 0; p->headerSize = headerSizeof(h, HEADER_MAGIC_NO); - p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL); + p->thisds = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL); p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, 0); p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, 0); p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, 0); @@ -519,7 +519,7 @@ rpmds rpmteDS(rpmte te, rpmTag tag) return NULL; switch (tag) { - case RPMTAG_NAME: return te->this; + case RPMTAG_NAME: return te->thisds; case RPMTAG_PROVIDENAME: return te->provides; case RPMTAG_REQUIRENAME: return te->requires; case RPMTAG_CONFLICTNAME: return te->conflicts; |