RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 14-Oct-2010 00:36:17 Branch: HEAD Handle: 2010101322361600 Modified files: rpm/lib order.c Log: - order: rip out the slashDepth hackery. Summary: Revision Changes Path 2.6 +0 -27 rpm/lib/order.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/order.c ============================================================================ $ cvs diff -u -r2.5 -r2.6 order.c --- rpm/lib/order.c 23 Jun 2010 16:14:53 -0000 2.5 +++ rpm/lib/order.c 13 Oct 2010 22:36:16 -0000 2.6 @@ -653,27 +653,6 @@ #endif #define isAuto(_x) ((_x) & _autobits) -#ifdef DYING -/*...@unchecked@*/ -static int slashDepth = 100; /* #slashes pemitted in parentdir deps. */ - -static int countSlashes(const char * dn) - /*...@*/ -{ - int nslashes = 0; - int c; - - while ((c = (int)*dn++) != 0) { - switch (c) { - default: continue; /*...@notreached@*/ /*...@switchbreak@*/break; - case '/': nslashes++; /*...@switchbreak@*/break; - } - } - - return nslashes; -} -#endif - /* Search for SCCs and return an array last entry has a .size of 0 */ static scc detectSCCs(rpmts ts) { @@ -1367,12 +1346,6 @@ if (requires != NULL) while (rpmdsNext(requires) >= 0) { -#ifdef DYING - /* XXX Attempt to avoid loops by filtering out deep paths. */ - if (countSlashes(rpmdsN(requires)) > slashDepth) - /*...@innercontinue@*/ continue; -#endif - /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */ #ifdef REFERENCE (void) orgrpmAddRelation(ts, al, p, requires); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
