In investigating an "assignment makes integer from pointer without a cast"
warning, I discovered that glyph_memory (an integer indicating the size of a
memory area) was being initialized to NULL.

It appears that this was introduced in commit
5957fdd9ba2aba60e90a30bc3744f76ddb27b8d2, "Janitor: Correct make distcheck and
sparse warnings."

Signed-off-by: Jeff Smith <[email protected]>
---
 src/xftdpy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/xftdpy.c b/src/xftdpy.c
index 0553515..cd50358 100644
--- a/src/xftdpy.c
+++ b/src/xftdpy.c
@@ -160,7 +160,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
     info->next = _XftDisplayInfo;
     _XftDisplayInfo = info;
 
-    info->glyph_memory = NULL;
+    info->glyph_memory = 0;
     info->max_glyph_memory = XftDefaultGetInteger (dpy,
                                                   XFT_MAX_GLYPH_MEMORY, 0,
                                                   XFT_DPY_MAX_GLYPH_MEMORY);
-- 
1.6.0.6

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to