RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ gzdio.c

From: Alexey Tourbin <at@rpm5.org>
Date: Wed 06 Aug 2008 - 08:20:21 CEST
Message-Id: <20080806062021.2D83F7C26@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Alexey Tourbin
  Root:   /v/rpm/cvs                       Email:  at@rpm5.org
  Module: rpm                              Date:   06-Aug-2008 08:20:21
  Branch: HEAD                             Handle: 2008080606202001

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               gzdio.c

  Log:
    gzdio: fixed and re-enabled rsyncable_gzwrite()

  Summary:
    Revision    Changes     Path
    1.2513      +1  -0      rpm/CHANGES
    2.12        +2  -2      rpm/rpmio/gzdio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2512 -r1.2513 CHANGES
  --- rpm/CHANGES	5 Aug 2008 21:10:29 -0000	1.2512
  +++ rpm/CHANGES	6 Aug 2008 06:20:20 -0000	1.2513
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - at: gzdio: fixed and re-enabled rsyncable_gzwrite()
       - jbj: rpmku: create opaque keyutils keyring.
       - jbj: keyutils: permit configurable keyring.
       - rse: fix building under --with-lzma by providing the necessary 64-bit defines for inclusion of <lzma.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/gzdio.c
  ============================================================================
  $ cvs diff -u -r2.11 -r2.12 gzdio.c
  --- rpm/rpmio/gzdio.c	2 Aug 2008 22:37:38 -0000	2.11
  +++ rpm/rpmio/gzdio.c	6 Aug 2008 06:20:21 -0000	2.12
  @@ -51,7 +51,7 @@
   
   /* Should gzflush be called only after RSYNC_WIN boundaries? */
   /*@unchecked@*/
  -static int enable_rsync = 0;
  +static int enable_rsync = 1;
   
   /* =============================================================== */
   /* from ../lib/cpio.h */
  @@ -348,7 +348,7 @@
   
       fdstat_enter(fd, FDSTAT_WRITE);
       if (enable_rsync)
  -	rc = rsyncable_gzwrite(rpmgz->gz, (void *)buf, (unsigned)count);
  +	rc = rsyncable_gzwrite(rpmgz, (void *)buf, (unsigned)count);
       else
   	rc = gzwrite(rpmgz->gz, (void *)buf, (unsigned)count);
   DBGIO(fd, (stderr, "==>\tgzdWrite(%p,%p,%u) rc %lx %s\n", cookie, buf, (unsigned)count, (unsigned long)rc, fdbg(fd)));
  @@ .
Received on Wed Aug 6 08:20:21 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.