Fwd: [CVS] RPM: rpm/rpmdb/ rpmdb.c
Jeff Johnson
n3npq at mac.com
Mon Jun 18 21:42:48 CEST 2007
Begin forwarded message:
> From: Jeff Johnson <jbj at rpm5.org>
> Date: June 18, 2007 3:39:27 PM EDT
> To: rpm-cvs at rpm5.org
> Subject: [CVS] RPM: rpm/rpmdb/ rpmdb.c
> Reply-To: rpm-devel at rpm5.org
>
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
>
> ______________________________________________________________________
> ______
>
> Server: rpm5.org Name: Jeff Johnson
> Root: /v/rpm/cvs Email: jbj at rpm5.org
> Module: rpm Date: 18-Jun-2007
> 21:39:27
> Branch: HEAD Handle: 2007061820392600
>
> Modified files:
> rpm/rpmdb rpmdb.c
>
> Log:
> fix ptr alignment problem seen on pld/sparc64.
>
> Summary:
> Revision Changes Path
> 1.131 +2 -3 rpm/rpmdb/rpmdb.c
>
> ______________________________________________________________________
> ______
>
> patch -p0 <<'@@ .'
> Index: rpm/rpmdb/rpmdb.c
>
> ======================================================================
> ======
> $ cvs diff -u -r1.130 -r1.131 rpmdb.c
> --- rpm/rpmdb/rpmdb.c 10 Jun 2007 20:44:43 -0000 1.130
> +++ rpm/rpmdb/rpmdb.c 18 Jun 2007 19:39:26 -0000 1.131
> @@ -3067,7 +3067,6 @@
> HAE_t hae = (HAE_t) headerAddEntry;
> HFD_t hfd = headerFreeData;
> sigset_t signalMask;
> - uint32_t hcolor = 0;
> const char ** baseNames;
> rpmTagType bnt;
> const char ** dirNames;
> @@ -3101,8 +3100,8 @@
> }
>
> /* Add the package color if not present. */
> - if (!hge(h, RPMTAG_PACKAGECOLOR, &bnt, &hcolor, &count)) {
> - hcolor = hGetColor(h);
> + if (!headerIsEntry(h, RPMTAG_PACKAGECOLOR)) {
> + uint32_t hcolor = hGetColor(h);
> xx = hae(h, RPMTAG_PACKAGECOLOR, RPM_INT32_TYPE, &hcolor, 1);
> }
>
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-cvs at rpm5.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: /mailman/pipermail/pld-devel-en/attachments/20070618/eafc8967/attachment.html
More information about the pld-devel-en
mailing list