RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Mar-2009 20:50:17 Branch: HEAD Handle: 2009030219501700 Modified files: rpm CHANGES rpm/rpmio bzdio.c Log: - jbj: bzdio: pop/replace ufdio with bzdio (including a fdno). Summary: Revision Changes Path 1.2794 +1 -0 rpm/CHANGES 2.9 +2 -2 rpm/rpmio/bzdio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2793 -r1.2794 CHANGES --- rpm/CHANGES 2 Mar 2009 19:25:47 -0000 1.2793 +++ rpm/CHANGES 2 Mar 2009 19:50:17 -0000 1.2794 @@ -1,5 +1,6 @@ 5.2a2 -> 5.2a3: + - jbj: bzdio: pop/replace ufdio with bzdio (including a fdno). - jbj: bzdio: take out the rubbish. - jbj: bzdio: stage the multi-block BZIP2 payload code for debugging. - jbj: bzdio: populate rpmbz with all but bz->fp, rearrange code to taste. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/bzdio.c ============================================================================ $ cvs diff -u -r2.8 -r2.9 bzdio.c --- rpm/rpmio/bzdio.c 2 Mar 2009 19:25:47 -0000 2.8 +++ rpm/rpmio/bzdio.c 2 Mar 2009 19:50:17 -0000 2.9 @@ -250,7 +250,7 @@ if (bz == NULL) return NULL; fd = fdNew("open (bzdOpen)"); -#ifdef NOTYET +#ifndef NOTYET fdPop(fd); fdPush(fd, bzdio, bz, fileno(bz->fp)); #else fdPop(fd); fdPush(fd, bzdio, bz, -1); @@ -271,7 +271,7 @@ if (bz == NULL) return NULL; -#ifdef NOTYET +#ifndef NOTYET fdPop(fd); fdPush(fd, bzdio, bz, fileno(bz->fp)); #else fdSetFdno(fd, -1); /* XXX skip the fdio close */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org