[PATCH libXft] Initialize glyph_memory to 0 instead of NULL, since it is a size
Jeff Smith
whydoubt at yahoo.com
Fri Mar 19 22:43:31 PDT 2010
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 <whydoubt at yahoo.com>
---
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
More information about the xorg-devel
mailing list