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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   04-Oct-2008 19:25:47
  Branch: HEAD                             Handle: 2008100417254700

  Modified files:
    rpm/rpmio               lzdio.c

  Log:
    make #if prettier on jeff's eyes

  Summary:
    Revision    Changes     Path
    1.16        +8  -10     rpm/rpmio/lzdio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/lzdio.c
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 lzdio.c
  --- rpm/rpmio/lzdio.c 4 Oct 2008 16:31:04 -0000       1.15
  +++ rpm/rpmio/lzdio.c 4 Oct 2008 17:25:47 -0000       1.16
  @@ -106,19 +106,17 @@
   #endif
        ret = lzma_alone_encoder(&lzfile->strm, &options);
       } else {
  -     ret = lzma_auto_decoder(&lzfile->strm,
   #if LZMA_VERSION == 49990030
  -                     NULL
  +     ret = lzma_auto_decoder(&lzfile->strm, NULL, 0);
   #else
  -                     /* FIXME: second argument now sets memory limit, 
setting it to
  -                      * '-1' means unlimited and isn't really recommended. A 
sane
  -                      *  default value when setting it to '0' will probably 
be
  -                      *  implemented in liblzma soon, so then we should 
switch
  -                      *  back to '0'.
  -                      */
  -                     -1
  +     /* FIXME: second argument now sets memory limit, setting it to
  +      * '-1' means unlimited and isn't really recommended. A sane
  +      * default value when setting it to '0' will probably be
  +      * implemented in liblzma soon, so then we should switch
  +      * back to '0'.
  +      */
  +     ret = lzma_auto_decoder(&lzfile->strm, -1, 0);
   #endif
  -                     , 0);
       }
       if (ret != LZMA_OK) {
        (void) fclose(fp);
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to