diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-25 10:30:58 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-26 11:10:27 -0700 |
| commit | 0a98d9e6cec7c611a3c56f97d4ddc0c546975c55 (patch) | |
| tree | cf79bfff0fb2cff402247f80498d70c05a0b6310 | |
| parent | 4e9d3e413245e7c01c2ff3c0f130b8967754131b (diff) | |
xf86bigfont: Silence compiler warning by initializing pDesc.
Access to pDesc was always guarded by (nCharInfos > 0), so the code
wasn't actually buggy, but this makes it clear that it's correct.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | Xext/xf86bigfont.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 8c4a7eba9..8b3913daa 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -404,7 +404,7 @@ ProcXF86BigfontQueryFont( int nCharInfos; int shmid; #ifdef HAS_SHM - ShmDescPtr pDesc; + ShmDescPtr pDesc = NULL; #else #define pDesc 0 #endif @@ -449,8 +449,6 @@ ProcXF86BigfontQueryFont( #ifdef HAS_SHM if (!badSysCall) pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex); - else - pDesc = NULL; if (pDesc) { pCI = (xCharInfo *) pDesc->attach_addr; if (stuff_flags & XF86Bigfont_FLAGS_Shm) |