RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/python/ header-py.c rpm/rpmdb/ header.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Thu 02 Aug 2007 - 21:55:46 CEST
Message-Id: <20070802195546.39CC834844E@rpm5.org>
  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:   02-Aug-2007 21:55:46
  Branch: HEAD                             Handle: 2007080220554501

  Modified files:
    rpm/python              header-py.c
    rpm/rpmdb               header.c

  Log:
    actually save the file I meant to check in.
    headerGetExtension() needs malloc, non min memory, for starters.

  Summary:
    Revision    Changes     Path
    1.48        +2  -0      rpm/python/header-py.c
    1.58        +1  -1      rpm/rpmdb/header.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.c
  ============================================================================
  $ cvs diff -u -r1.47 -r1.48 header-py.c
  --- rpm/python/header-py.c	30 Jul 2007 17:34:36 -0000	1.47
  +++ rpm/python/header-py.c	2 Aug 2007 19:55:45 -0000	1.48
  @@ -750,6 +750,8 @@
   		ext = extensions;
   	    }
   	    extensions++;
  +	    if (extensions->type == HEADER_EXT_MORE)
  +		extensions = extensions->u.more;
   	}
       }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 header.c
  --- rpm/rpmdb/header.c	2 Aug 2007 18:38:20 -0000	1.57
  +++ rpm/rpmdb/header.c	2 Aug 2007 19:55:46 -0000	1.58
  @@ -1881,7 +1881,7 @@
   	int freeData = 0;	/* XXX lots of memory leaks. */
   	return ext->u.tagFunction(h, type, p, c, &freeData);
       } else
  -	return intGetEntry(h, tag, type, (hPTR_t *)p, c, 1);
  +	return intGetEntry(h, tag, type, (hPTR_t *)p, c, 0);
   }
   
   /** \ingroup header
  @@ .
Received on Thu Aug 2 21:55:46 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.