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:   30-Jul-2007 04:37:51
  Branch: rpm-4_5                          Handle: 2007073003375000

  Modified files:           (Branch: rpm-4_5)
    rpm/rpmio               rpmio.c rpmio.h

  Log:
    assume modern bzlib API.

  Summary:
    Revision    Changes     Path
    1.79.2.3    +8  -18     rpm/rpmio/rpmio.c
    1.51.2.3    +1  -1      rpm/rpmio/rpmio.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.79.2.2 -r1.79.2.3 rpmio.c
  --- rpm/rpmio/rpmio.c	17 Jun 2007 14:41:58 -0000	1.79.2.2
  +++ rpm/rpmio/rpmio.c	30 Jul 2007 02:37:50 -0000	1.79.2.3
  @@ -2560,16 +2560,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)
   	/*@*/
   {
  @@ -2597,7 +2587,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);
  @@ -2632,7 +2622,7 @@
   	/*@globals fileSystem @*/
   	/*@modifies fileSystem @*/
   {
  -    return bzflush(bzdFileno(fd));
  +    return BZ2_bzflush(bzdFileno(fd));
   }
   /*@=globuse@*/
   
  @@ -2652,12 +2642,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@*/
  @@ -2684,10 +2674,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);
       }
  @@ -2718,7 +2708,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 */
   
  @@ -2727,7 +2717,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);
   	}
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.51.2.2 -r1.51.2.3 rpmio.h
  --- rpm/rpmio/rpmio.h	17 Jun 2007 14:41:58 -0000	1.51.2.2
  +++ rpm/rpmio/rpmio.h	30 Jul 2007 02:37:50 -0000	1.51.2.3
  @@ -664,7 +664,7 @@
    * @param prompt	prompt string
    * @return		password
    */
  -char * (*Getpass) (const char * prompt)
  +extern char * (*Getpass) (const char * prompt)
   	/*@*/;
   char * _GetPass (const char * prompt)
   	/*@*/;
  @@ .