From c8c41614911be4fa222fa22478677d263b41c751 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 6 Apr 2009 16:52:46 -0700 Subject: Fix a several sparse warnings: Using plain integer as NULL pointer Signed-off-by: Alan Coopersmith --- src/ImUtil.c | 2 +- src/OpenDis.c | 4 ++-- src/XlibInt.c | 2 +- src/xkb/XKBBind.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ImUtil.c b/src/ImUtil.c index e79ec155..35768563 100644 --- a/src/ImUtil.c +++ b/src/ImUtil.c @@ -374,7 +374,7 @@ XImage *XCreateImage ( if (image_bytes_per_line == 0) { image->bytes_per_line = min_bytes_per_line; } else if (image_bytes_per_line < min_bytes_per_line) { - return 0; + return NULL; } else { image->bytes_per_line = image_bytes_per_line; } diff --git a/src/OpenDis.c b/src/OpenDis.c index 2d61be12..29ac65c6 100644 --- a/src/OpenDis.c +++ b/src/OpenDis.c @@ -167,8 +167,8 @@ XOpenDisplay ( #if USE_XCB if(!_XConnectXCB(dpy, display, &fullname, &iscreen)) { dpy->display_name = fullname; - OutOfMemory(dpy, 0); - return 0; + OutOfMemory(dpy, NULL); + return NULL; } #else /* !USE_XCB */ if ((dpy->trans_conn = _X11TransConnectDisplay ( diff --git a/src/XlibInt.c b/src/XlibInt.c index 0a0c5371..ad91400d 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -3282,7 +3282,7 @@ Screen *_XScreenOfWindow(Display *dpy, Window w) if (XGetGeometry (dpy, w, &root, &x, &y, &width, &height, &bw, &depth) == False) { - return None; + return NULL; } for (i = 0; i < ScreenCount (dpy); i++) { /* find root from list */ if (root == RootWindow (dpy, i)) { diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c index a349debe..556917bd 100644 --- a/src/xkb/XKBBind.c +++ b/src/xkb/XKBBind.c @@ -632,7 +632,7 @@ XkbTranslateKeySym( register Display * dpy, } if (change) { if (n==1) - *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,0); + *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,NULL); else *sym_rtrn= NoSymbol; } } -- cgit v1.2.3