diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2007-12-17 13:01:50 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2007-12-17 13:01:50 +0200 |
commit | 05a16276ba5c4337f7bd1e1d64957c3ce364c106 (patch) | |
tree | 16cbabafd732ab5839c109aed9392b3bac1b8122 /lib | |
parent | 834a79e6158d9950f37cf66922875f2a10af4d21 (diff) | |
download | librpm-tizen-05a16276ba5c4337f7bd1e1d64957c3ce364c106.tar.gz librpm-tizen-05a16276ba5c4337f7bd1e1d64957c3ce364c106.tar.bz2 librpm-tizen-05a16276ba5c4337f7bd1e1d64957c3ce364c106.zip |
badDeps is encapsulated within depends, doesn't need const
- remove ancient reference code
Diffstat (limited to 'lib')
-rw-r--r-- | lib/depends.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/depends.c b/lib/depends.c index d4b9f4aaf..e2d2d88ac 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -711,22 +711,12 @@ static int checkDependentConflicts(rpmts ts, const char * dep) } struct badDeps_s { - const char * pname; + char * pname; const char * qname; }; -#ifdef REFERENCE -static struct badDeps_s { -const char * pname; -const char * qname; -} badDeps[] = { - { NULL, NULL } -}; -#else static int badDepsInitialized = 0; - static struct badDeps_s * badDeps = NULL; -#endif /** */ @@ -734,6 +724,7 @@ static void freeBadDeps(void) { if (badDeps) { struct badDeps_s * bdp; + /* bdp->qname is a pointer to pname so doesn't need freeing */ for (bdp = badDeps; bdp->pname != NULL && bdp->qname != NULL; bdp++) bdp->pname = _free(bdp->pname); badDeps = _free(badDeps); |