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 22:16:00
Branch: HEAD Handle: 2009030221155900
Modified files:
rpm CHANGES
rpm/rpmio bzdio.c
Log:
- jbj: bzdio: hmm, revert the pop/replace patch, there's more todo++
...
Summary:
Revision Changes Path
1.2795 +1 -0 rpm/CHANGES
2.10 +2 -2 rpm/rpmio/bzdio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2794 -r1.2795 CHANGES
--- rpm/CHANGES 2 Mar 2009 19:50:17 -0000 1.2794
+++ rpm/CHANGES 2 Mar 2009 21:15:59 -0000 1.2795
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - jbj: bzdio: hmm, revert the pop/replace patch, there's more todo++ ...
- 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.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/bzdio.c
============================================================================
$ cvs diff -u -r2.9 -r2.10 bzdio.c
--- rpm/rpmio/bzdio.c 2 Mar 2009 19:50:17 -0000 2.9
+++ rpm/rpmio/bzdio.c 2 Mar 2009 21:15:59 -0000 2.10
@@ -250,7 +250,7 @@
if (bz == NULL)
return NULL;
fd = fdNew("open (bzdOpen)");
-#ifndef NOTYET
+#ifdef 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;
-#ifndef NOTYET
+#ifdef 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
