diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-10-19 11:59:23 -0400 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:52:24 +0000 |
| commit | 63ccaec2c39f4b5742383472c951ee2cd35c9e14 (patch) | |
| tree | e203fd44e59eee9b631f7410dabc5c856e9065c7 | |
| parent | d057e265c862f90e9b6fddff89f40cb82b2a59b1 (diff) | |
glx: warning fixes
render2.c: In function ‘__glXDisp_Map2d’:
render2.c:127: warning: ‘u1’ may be used uninitialized in this function
render2.c: In function ‘__glXDisp_Map1d’:
render2.c:90: warning: ‘u1’ may be used uninitialized in this function
Remove unnecessary test, and change memcpy to memmove as all users were
doing overlapping copies.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | glx/unpack.h | 2 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/unpack.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/glx/unpack.h b/glx/unpack.h index a4e6d7e84..738e79dc4 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 f34b6fd51..f4a957206 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)) |