[PATCH 7/9] glx: warning fixes
Cyril Brulebois
kibi at debian.org
Fri Jan 14 21:43:14 PST 2011
Daniel Stone <daniel at fooishbar.org> (31/12/2010):
> v2: Took Keith's advice and changed memcpy to memmove, as well as the DMX
> glxproxy equivalent; turns out every single user was doing overlapping
> memcpys. -daniels
yeah, nasty…
> diff --git a/glx/unpack.h b/glx/unpack.h
> index a4e6d7e..738e79d 100644
> --- a/glx/unpack.h
> +++ b/glx/unpack.h
> @@ -47,7 +47,7 @@
> ** Fetch a double from potentially unaligned memory.
> */
> #ifdef __GLX_ALIGN64
> -#define __GLX_MEM_COPY(dst,src,n) if (src != NULL && dst != NULL) memcpy(dst,src,n)
> +#define __GLX_MEM_COPY(dst,src,n) memmove(dst,src,n)
> #define __GLX_GET_DOUBLE(dst,src) __GLX_MEM_COPY(&dst,src,8)
> #else
> #define __GLX_GET_DOUBLE(dst,src) (dst) = *((GLdouble*)(src))
> diff --git a/hw/dmx/glxProxy/unpack.h b/hw/dmx/glxProxy/unpack.h
> index f34b6fd..f4a9572 100644
> --- a/hw/dmx/glxProxy/unpack.h
> +++ b/hw/dmx/glxProxy/unpack.h
> @@ -43,7 +43,7 @@
> ** Fetch a double from potentially unaligned memory.
> */
> #ifdef __GLX_ALIGN64
> -#define __GLX_MEM_COPY(dst,src,n) memcpy(dst,src,n)
> +#define __GLX_MEM_COPY(dst,src,n) memmove(dst,src,n)
> #define __GLX_GET_DOUBLE(dst,src) __GLX_MEM_COPY(&dst,src,8)
> #else
> #define __GLX_GET_DOUBLE(dst,src) (dst) = *((GLdouble*)(src))
Reviewed-by: Cyril Brulebois <kibi at debian.org>
KiBi.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110115/da5cd5c4/attachment.pgp>
More information about the xorg-devel
mailing list