Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 07e56ec36f5b6db53acae40086fcf8ad > files > 22

rpm-4.4.2.3-20mnb2.src.rpm

--- rpm-4.4.2.2/rpmdb/rpmdb.c.speedup	2007-09-11 08:41:15.000000000 +0200
+++ rpm-4.4.2.2/rpmdb/rpmdb.c	2007-10-23 17:02:54.000000000 +0200
@@ -3379,34 +3379,6 @@ exit:
     return ret;
 }
 
-#define _skip(_dn)	{ sizeof(_dn)-1, (_dn) }
-
-/*@unchecked@*/ /*@observer@*/
-static struct skipDir_s {
-    int dnlen;
-/*@observer@*/ /*@null@*/
-    const char * dn;
-} skipDirs[] = {
-    { 0, NULL }
-};
-
-static int skipDir(const char * dn)
-	/*@*/
-{
-    struct skipDir_s * sd = skipDirs;
-    int dnlen;
-
-    dnlen = strlen(dn);
-    for (sd = skipDirs; sd->dn != NULL; sd++) {
-	if (dnlen < sd->dnlen)
-	    continue;
-	if (strncmp(dn, sd->dn, sd->dnlen))
-	    continue;
-	return 1;
-    }
-    return 0;
-}
-
 /* XXX transaction.c */
 /*@-compmempass@*/
 int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, dbiIndexSet * matchList, 
@@ -3443,9 +3415,6 @@ key->data = (void *) fpList[i].baseName;
 key->size = strlen((char *)key->data);
 if (key->size == 0) key->size++;	/* XXX "/" fixup. */
 
-	if (skipDir(fpList[i].entry->dirName))
-	    continue;
-
 	xx = rpmdbGrowIterator(mi, i);
 
     }