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>
This commit is contained in:
parent
4e9d3e4132
commit
0a98d9e6ce
|
@ -404,7 +404,7 @@ ProcXF86BigfontQueryFont(
|
||||||
int nCharInfos;
|
int nCharInfos;
|
||||||
int shmid;
|
int shmid;
|
||||||
#ifdef HAS_SHM
|
#ifdef HAS_SHM
|
||||||
ShmDescPtr pDesc;
|
ShmDescPtr pDesc = NULL;
|
||||||
#else
|
#else
|
||||||
#define pDesc 0
|
#define pDesc 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -449,8 +449,6 @@ ProcXF86BigfontQueryFont(
|
||||||
#ifdef HAS_SHM
|
#ifdef HAS_SHM
|
||||||
if (!badSysCall)
|
if (!badSysCall)
|
||||||
pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
|
pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
|
||||||
else
|
|
||||||
pDesc = NULL;
|
|
||||||
if (pDesc) {
|
if (pDesc) {
|
||||||
pCI = (xCharInfo *) pDesc->attach_addr;
|
pCI = (xCharInfo *) pDesc->attach_addr;
|
||||||
if (stuff_flags & XF86Bigfont_FLAGS_Shm)
|
if (stuff_flags & XF86Bigfont_FLAGS_Shm)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user