Janitor: Correct make distcheck and gcc/sparse warnings.

5 files changed, 12 insertions, 19 deletions

diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index b956f41..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXfixes.la
-*.lo
-Makefile
-Makefile.in
-*~
diff --git a/src/Cursor.c b/src/Cursor.c
index dac1f1c..5fd8efe 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -79,7 +79,7 @@ XFixesGetCursorImage (Display *dpy)
     XFixesCursorImage			*image;
     char				*name;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     LockDisplay (dpy);
     GetReq (XFixesGetCursorImageAndName, req);
     req->reqType = info->codes->major_opcode;
@@ -91,7 +91,7 @@ XFixesGetCursorImage (Display *dpy)
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     if (info->major_version < 2)
     {
@@ -115,7 +115,7 @@ XFixesGetCursorImage (Display *dpy)
 	_XEatData (dpy, nbytes);
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     image->x = rep.x;
     image->y = rep.y;
@@ -171,9 +171,9 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom)
     xXFixesGetCursorNameReply	rep;
     char			*name;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     if (info->major_version < 2)
-	return 0;
+	return NULL;
     LockDisplay (dpy);
     GetReq (XFixesGetCursorName, req);
     req->reqType = info->codes->major_opcode;
@@ -183,7 +183,7 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom)
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     *atom = rep.atom;
     if ((name = (char *) Xmalloc(rep.nbytes+1))) {
diff --git a/src/Makefile.am b/src/Makefile.am
index 27ba027..3ba9522 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,8 @@ libXfixes_la_SOURCES = 	\
 	Xfixes.c	\
 	Xfixesint.h
 
-libXfixes_la_LIBADD = @X_LIBS@
-AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@
+libXfixes_la_LIBADD = @FIXESEXT_LIBS@
+AM_CFLAGS = @FIXESEXT_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
 
diff --git a/src/Region.c b/src/Region.c
index e75e1c1..842da06 100644
--- a/src/Region.c
+++ b/src/Region.c
@@ -316,7 +316,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
     long    			nbytes;
     long			nread;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     LockDisplay (dpy);
     GetReq (XFixesFetchRegion, req);
     req->reqType = info->codes->major_opcode;
@@ -327,7 +327,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     bounds->x = rep.x;
     bounds->y = rep.y;
@@ -342,7 +342,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
 	_XEatData (dpy, nbytes);
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     _XRead16 (dpy, (short *) rects, nrects << 3);
     /* skip any padding */
diff --git a/src/Xfixes.c b/src/Xfixes.c
index 05bfac2..b9b0fb6 100644
--- a/src/Xfixes.c
+++ b/src/Xfixes.c
@@ -87,7 +87,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
 	    UnlockDisplay (dpy);
 	    SyncHandle ();
 	    Xfree(info);
-	    return 0;
+	    return NULL;
 	}
 	info->major_version = rep.majorVersion;
 	info->minor_version = rep.minorVersion;