RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Apr-2011 12:17:09 Branch: rpm-5_4 Handle: 2011041010170900 Modified files: (Branch: rpm-5_4) rpm/tools dbconvert.c Log: drop __builtin_expect micro optimization which most likely the only considerable effect of being breaking compatibility Summary: Revision Changes Path 2.1.2.4 +2 -2 rpm/tools/dbconvert.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c ============================================================================ $ cvs diff -u -r2.1.2.3 -r2.1.2.4 dbconvert.c --- rpm/tools/dbconvert.c 30 Mar 2011 14:17:31 -0000 2.1.2.3 +++ rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 -0000 2.1.2.4 @@ -172,14 +172,14 @@ fflush(stdout); if(i == 1 && !*(uint32_t*)key.data) continue; - if(__builtin_expect(doswap, 1) < 0) { + if(doswap < 0) { if((htole32(*(uint32_t*)key.data) > 10000000 && swap < 0) || (htole32(*(uint32_t*)key.data) < 10000000 && swap > 0)) doswap = 1; else doswap = 0; } - if(__builtin_expect(doswap, 1)) { + if(doswap) { if(swap) *(uint32_t*)key.data = bswap32(*(uint32_t*)key.data); } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org