From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Vesely Subject: Re: [PATCH libdrm 4/8] xf86drmSL: Fix neighbour printing Date: Sun, 15 Mar 2015 14:31:29 -0400 Message-ID: <1426444289.12145.2.camel@rutgers.edu> References: <1425060448-5315-1-git-send-email-jan.vesely@rutgers.edu> <1425060448-5315-5-git-send-email-jan.vesely@rutgers.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0789713248==" Return-path: Received: from mail-qg0-f52.google.com (mail-qg0-f52.google.com [209.85.192.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C2F46E035 for ; Sun, 15 Mar 2015 11:31:31 -0700 (PDT) Received: by qgfa8 with SMTP id a8so24164871qgf.0 for ; Sun, 15 Mar 2015 11:31:31 -0700 (PDT) In-Reply-To: <1425060448-5315-5-git-send-email-jan.vesely@rutgers.edu> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kristian =?ISO-8859-1?Q?H=F8gsberg?= Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============0789713248== Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-NKoP2Uo2+WPX4jXvHuWa" --=-NKoP2Uo2+WPX4jXvHuWa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Kristian, this patch partially reverts e4a519635: Tidy up compile warnings by cleaning up types. it looks to me that the xf86drmSL.c bits slipped in by accident. thanks, Jan On Fri, 2015-02-27 at 13:07 -0500, Jan Vesely wrote: > Signed-off-by: Jan Vesely > --- > xf86drmSL.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) >=20 > diff --git a/xf86drmSL.c b/xf86drmSL.c > index acddb54..2160bb8 100644 > --- a/xf86drmSL.c > +++ b/xf86drmSL.c > @@ -266,11 +266,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key= , > SkipListPtr list =3D (SkipListPtr)l; > SLEntryPtr update[SL_MAX_LEVEL + 1]; > int retcode =3D 0; > + SLEntryPtr entry; > + > + entry =3D SLLocate(list, key, update); > =20 > *prev_key =3D *next_key =3D key; > *prev_value =3D *next_value =3D NULL; > -=09 > - if (update[0]) { > + > + if (entry && update[0]) { > *prev_key =3D update[0]->key; > *prev_value =3D update[0]->value; > ++retcode; --=20 Jan Vesely --=-NKoP2Uo2+WPX4jXvHuWa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJVBdABAAoJEDhUsXb6ZiH/OvIP/0FD4bUF1mExQcOnwvqOsyby vTdlh1VxC0utKqZWvdWvSsXA8ZuCwS/kXDanNxOlPTiPa294o44LDisAz+4zLYGU B1LgHxHIZIfcQvUEw29+fRQbHOkXNE7B9iMKuwnNCOHieVidh55Pf8HvBVcJtQ4K 0WfzFBlNGsxQmAFao9oCxUq85uLON1vevZHzUy+CMSPFiJyNXgL15wxVkLNImkZo /nlGUmoGR7E8r90CrOYIeTq/fpBhuhVOy1NdDd5DpipfxmkSP6vuOQShZZaEDFoj B/6mvtZniI5WPXBGRaa8FwyEkjs9d4EFGWQ+jeHUvlI8gZ2lwlARkCUqIU5MdiXi 0nRyarzDE9M2uRBLfSkwuxrWv2FbplLOhGfXuio7bZP3yEoFEFFKCbrEkxFx9CAV 1xmZX0AJ96FcEow6wJ7ytx7tUK0AhGyvLJjEo6yGMQSk3LwLjXHI7Oq5UPn5EWsU AflweVEpYkhdBGusYMYJAFB4M8q1MINY5Cle7LdhYJo6EowDCONJsi7NaePGcxOi 4tWrTuf3Ly22pVLe3u2CFtruhYljPAlpbJi9PwBEJZlRz3eNdZdFxmHZQnIrEuBV aqNa4lmvCCDazf7/Uh4qlBrZhLaxWxB547xmvW90GzI2ED2FwjLg1PG0QvqaIWnw VWJQVD47aF1WYGFQcEKn =uem7 -----END PGP SIGNATURE----- --=-NKoP2Uo2+WPX4jXvHuWa-- --===============0789713248== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK --===============0789713248==--