RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   20-Jun-2007 17:55:39
  Branch: HEAD                             Handle: 2007062016553900

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmio.c

  Log:
    - rse: remove the hysterical bzip2 interface.

  Summary:
    Revision    Changes     Path
    1.1378      +1  -0      rpm/CHANGES
    1.82        +9  -19     rpm/rpmio/rpmio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1377 -r1.1378 CHANGES
  --- rpm/CHANGES	19 Jun 2007 16:18:59 -0000	1.1377
  +++ rpm/CHANGES	20 Jun 2007 15:55:39 -0000	1.1378
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: remove the hysterical bzip2 interface.
       - rse: add the missing Autoconf glue code for using mmap(2) in the code
       - rse: (temporarily) remove partial Lua/libsyck support from build environment
       - jbj: refactor fi->replaced to persistent rpmte storage.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.81 -r1.82 rpmio.c
  --- rpm/rpmio/rpmio.c	20 Jun 2007 09:17:46 -0000	1.81
  +++ rpm/rpmio/rpmio.c	20 Jun 2007 15:55:39 -0000	1.82
  @@ -2561,16 +2561,6 @@
   
   #include <bzlib.h>
   
  -#ifdef HAVE_BZ2_1_0
  -# define bzopen  BZ2_bzopen
  -# define bzclose BZ2_bzclose
  -# define bzdopen BZ2_bzdopen
  -# define bzerror BZ2_bzerror
  -# define bzflush BZ2_bzflush
  -# define bzread  BZ2_bzread
  -# define bzwrite BZ2_bzwrite
  -#endif /* HAVE_BZ2_1_0 */
  -
   static inline /*@dependent@*/ void * bzdFileno(FD_t fd)
   	/*@*/
   {
  @@ -2598,7 +2588,7 @@
   {
       FD_t fd;
       BZFILE *bzfile;;
  -    if ((bzfile = bzopen(path, mode)) == NULL)
  +    if ((bzfile = BZ2_bzopen(path, mode)) == NULL)
   	return NULL;
       fd = fdNew("open (bzdOpen)");
       fdPop(fd); fdPush(fd, bzdio, bzfile, -1);
  @@ -2619,7 +2609,7 @@
       fdno = fdFileno(fd);
       fdSetFdno(fd, -1);		/* XXX skip the fdio close */
       if (fdno < 0) return NULL;
  -    bzfile = bzdopen(fdno, fmode);
  +    bzfile = BZ2_bzdopen(fdno, fmode);
       if (bzfile == NULL) return NULL;
   
       fdPush(fd, bzdio, bzfile, fdno);		/* Push bzdio onto stack */
  @@ -2633,7 +2623,7 @@
   	/*@globals fileSystem @*/
   	/*@modifies fileSystem @*/
   {
  -    return bzflush(bzdFileno(fd));
  +    return BZ2_bzflush(bzdFileno(fd));
   }
   /*@=globuse@*/
   
  @@ -2653,12 +2643,12 @@
       fdstat_enter(fd, FDSTAT_READ);
       if (bzfile)
   	/*@-compdef@*/
  -	rc = bzread(bzfile, buf, count);
  +	rc = BZ2_bzread(bzfile, buf, count);
   	/*@=compdef@*/
       if (rc == -1) {
   	int zerror = 0;
   	if (bzfile)
  -	    fd->errcookie = bzerror(bzfile, &zerror);
  +	    fd->errcookie = BZ2_bzerror(bzfile, &zerror);
       } else if (rc >= 0) {
   	fdstat_exit(fd, FDSTAT_READ, rc);
   	/*@-compdef@*/
  @@ -2685,10 +2675,10 @@
   
       bzfile = bzdFileno(fd);
       fdstat_enter(fd, FDSTAT_WRITE);
  -    rc = bzwrite(bzfile, (void *)buf, count);
  +    rc = BZ2_bzwrite(bzfile, (void *)buf, count);
       if (rc == -1) {
   	int zerror = 0;
  -	fd->errcookie = bzerror(bzfile, &zerror);
  +	fd->errcookie = BZ2_bzerror(bzfile, &zerror);
       } else if (rc > 0) {
   	fdstat_exit(fd, FDSTAT_WRITE, rc);
       }
  @@ -2719,7 +2709,7 @@
       if (bzfile == NULL) return -2;
       fdstat_enter(fd, FDSTAT_CLOSE);
       /*@-noeffectuncon@*/ /* FIX: check rc */
  -    bzclose(bzfile);
  +    BZ2_bzclose(bzfile);
       /*@=noeffectuncon@*/
       rc = 0;	/* XXX FIXME */
   
  @@ -2728,7 +2718,7 @@
       if (fd) {
   	if (rc == -1) {
   	    int zerror = 0;
  -	    fd->errcookie = bzerror(bzfile, &zerror);
  +	    fd->errcookie = BZ2_bzerror(bzfile, &zerror);
   	} else if (rc >= 0) {
   	    fdstat_exit(fd, FDSTAT_CLOSE, rc);
   	}
  @@ .