badDeps is encapsulated within depends, doesn't need const
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 17 Dec 2007 11:01:50 +0000 (13:01 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 17 Dec 2007 11:01:50 +0000 (13:01 +0200)
- remove ancient reference code

lib/depends.c

index d4b9f4a..e2d2d88 100644 (file)
@@ -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);