Janitor: ansification, make distcheck, compiler warnings.

11 files changed, 44 insertions, 53 deletions

diff --git a/.gitignore b/.gitignore
index 84e7fe2..cc3299b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
@@ -19,3 +21,9 @@ mkinstalldirs
 oldx.pc
 stamp-h1
 *~
+*.o
+*.la
+*.lo
+liboldX-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 9978033..62e0102 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,15 +24,12 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = oldx.pc
 
-EXTRA_DIST = oldx.pc.in autogen.sh
-
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = oldx.pc.in ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 733f5e5..e9fed12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,20 +27,25 @@ AC_INIT(liboldX, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Check for dependencies
 PKG_CHECK_MODULES(OLDX, x11)
-
+OLDX_CFLAGS="$CWARNFLAGS $OLDX_CFLAGS"
 AC_SUBST(OLDX_CFLAGS)
 AC_SUBST(OLDX_LIBS)
 		  
 XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/include/X11/X10.h b/include/X11/X10.h
index afdb80d..f2c0e21 100644
--- a/include/X11/X10.h
+++ b/include/X11/X10.h
@@ -83,7 +83,16 @@ typedef struct {
     int size;			/* Table size (number of buckets). */
 } XAssocTable;
 
-XAssocTable *XCreateAssocTable();
-char *XLookUpAssoc();
+extern Status XDraw(Display *dpy, Drawable d, GC gc,
+		    Vertex *vlist, int vcount);
+extern Status XDrawFilled(Display *dpy, Drawable d, GC gc,
+			  Vertex *vlist, int vcount);
+
+extern XAssocTable *XCreateAssocTable(int size);
+extern int XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id);
+extern int XDestroyAssocTable(XAssocTable *table);
+extern char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id);
+extern int XMakeAssoc(Display *dpy, XAssocTable *table, XID x_id,
+		      XPointer data);
 
 #endif /* _X10_H_ */
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 11f61fd..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-liboldX.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/XCrAssoc.c b/src/XCrAssoc.c
index d36e952..2b33e10 100644
--- a/src/XCrAssoc.c
+++ b/src/XCrAssoc.c
@@ -38,8 +38,7 @@ in this Software without prior written authorization from The Open Group.
  * buckets is 8.  If there is an error creating the XAssocTable, a NULL
  * pointer is returned.
  */
-XAssocTable *XCreateAssocTable(size)
-	register int size;		/* Desired size of the table. */
+XAssocTable *XCreateAssocTable(int size)
 {
 	register XAssocTable *table;	/* XAssocTable to be initialized. */
 	register XAssoc *buckets;	/* Pointer to the first bucket in */
diff --git a/src/XDelAssoc.c b/src/XDelAssoc.c
index e7c4b75..814eab4 100644
--- a/src/XDelAssoc.c
+++ b/src/XDelAssoc.c
@@ -38,10 +38,7 @@ in this Software without prior written authorization from The Open Group.
  * deletes are meaningless (but cause no problems).
  */
 int
-XDeleteAssoc(dpy, table, x_id)
-        register Display *dpy;
-	register XAssocTable *table;
-	register XID x_id;
+XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id)
 {
 	int hash;
 	register XAssoc *bucket;
diff --git a/src/XDestAssoc.c b/src/XDestAssoc.c
index 672ac23..3dc3680 100644
--- a/src/XDestAssoc.c
+++ b/src/XDestAssoc.c
@@ -37,8 +37,7 @@ in this Software without prior written authorization from The Open Group.
  * an XAssocTable.  
  */
 int
-XDestroyAssocTable(table)
-	register XAssocTable *table;
+XDestroyAssocTable(XAssocTable *table)
 {
 	register int i;
 	register XAssoc *bucket;
diff --git a/src/XDraw.c b/src/XDraw.c
index 3eeff3e..fa32dbc 100644
--- a/src/XDraw.c
+++ b/src/XDraw.c
@@ -202,11 +202,11 @@ static short segtable[] = {  10,  3, 56,	/* pl <= 10, 3 segments     */
  *
  */
 							 
-static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
-  Vertex  *pathaddr;	    /* address of original path list             */
-  int	  pathcount;        /* number of points in original path list    */
-  Vertex  **ppathaddr_new;  /* ptr to addr of new path list      */
-  int     *newpathcnt;	    /* ptr to new number of pts in path list */
+static int vertices_converter(
+  Vertex  *pathaddr,	    /* address of original path list             */
+  int	  pathcount,        /* number of points in original path list    */
+  Vertex  **ppathaddr_new,  /* ptr to addr of new path list      */
+  int     *newpathcnt)	    /* ptr to new number of pts in path list */
 {
   int p0x, p0y;   	    /* coordinates of curve's predecessor point  */
   int p1x, p1y;   	    /* coordinates of curve's starting point     */
@@ -266,7 +266,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
       {
 	path_coord_list_segs = max (200, pathcount);
 	path_coord_list_bytes = path_coord_list_segs * sizeof(Vertex);
-	if ((pathaddr_coords = (Vertex *)Xmalloc(path_coord_list_bytes)) != 0)
+	if ((pathaddr_coords = (Vertex *)Xmalloc(path_coord_list_bytes)))
 	  p_coord_path = pathaddr_coords;
 	else
 	  return(ERR_RETURN);
@@ -280,7 +280,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
 	    Xfree( pathaddr_coords);
 	    path_coord_list_segs = pathcount;
 	    path_coord_list_bytes = path_coord_list_segs * sizeof(Vertex);
-	    if ((pathaddr_coords =(Vertex *)Xmalloc(path_coord_list_bytes)) !=0)
+	    if ((pathaddr_coords =(Vertex *)Xmalloc(path_coord_list_bytes)))
 	      p_coord_path = pathaddr_coords;
 	    else
 	      return(ERR_RETURN);
@@ -341,7 +341,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
 	Xfree( pathaddr_new );
       pathlist_segs = pathcount;
       pathlist_bytes = pathcount * sizeof(Vertex);
-      if ((pathaddr_new = (Vertex *)Xmalloc(pathlist_bytes)) != 0)
+      if ((pathaddr_new = (Vertex *)Xmalloc(pathlist_bytes)))
 	pnewpath = pathaddr_new;
       else
 	return(ERR_RETURN);
@@ -476,7 +476,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
 		    pathlist_segs *= 2;
 		    pathlist_bytes *= 2;
 		    if ((pathaddr_new = (Vertex *)Xrealloc(pathaddr_new, 
-							 pathlist_bytes)) != 0)
+							   pathlist_bytes)))
 		      pnewpath = pathaddr_new + newpathcount;
 	    	    else
 		      return(ERR_RETURN);
@@ -531,7 +531,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
 	    pathlist_bytes *= 2;
 	    pathlist_segs *= 2;
 	    if ((pathaddr_new = (Vertex *)Xrealloc(pathaddr_new, 
-						 pathlist_bytes)) != 0)
+						   pathlist_bytes)))
 	      pnewpath = pathaddr_new + newpathcount;
     	    else
 	      return(ERR_RETURN);
@@ -554,12 +554,7 @@ static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
 static XPoint *XDraw_points = NULL;    /* Buffer to hold list of points for */
 static int    point_count = 0;         /* use in calling XDrawLines         */
 
-Status XDraw (dpy, d, gc, vlist, vcount)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    Vertex *vlist;
-    int vcount;
+Status XDraw (Display *dpy, Drawable d, GC gc, Vertex *vlist, int vcount)
 {
   Vertex *newvlist;
   int newvcount;
@@ -631,12 +626,7 @@ Status XDraw (dpy, d, gc, vlist, vcount)
   return(OK_RETURN);
 }
 
-Status XDrawFilled (dpy, d, gc, vlist, vcount)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    Vertex *vlist;
-    int vcount;
+Status XDrawFilled (Display *dpy, Drawable d, GC gc, Vertex *vlist, int vcount)
 {
   Vertex *newvlist;
   int newvcount;
diff --git a/src/XLookAssoc.c b/src/XLookAssoc.c
index fe150c9..3688150 100644
--- a/src/XLookAssoc.c
+++ b/src/XLookAssoc.c
@@ -38,10 +38,7 @@ in this Software without prior written authorization from The Open Group.
  * in the table the routine will return a NULL pointer.  All XId's are relative
  * to the currently active Display.
  */
-XPointer XLookUpAssoc(dpy, table, x_id)
-        register Display *dpy;
-	register XAssocTable *table;	/* XAssocTable to search in. */
-	register XID x_id;			/* XId to search for. */
+XPointer XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id)
 {
 	int hash;
 	register XAssoc *bucket;
diff --git a/src/XMakeAssoc.c b/src/XMakeAssoc.c
index 40b3562..8a0eec1 100644
--- a/src/XMakeAssoc.c
+++ b/src/XMakeAssoc.c
@@ -39,11 +39,7 @@ in this Software without prior written authorization from The Open Group.
  * bucket is sorted (lowest XId to highest XId).
  */
 int
-XMakeAssoc(dpy, table, x_id, data)
-	register Display *dpy;
-	register XAssocTable *table;
-	register XID x_id;
-	register XPointer data;
+XMakeAssoc(Display *dpy, XAssocTable *table, XID x_id, XPointer data)
 {
 	int hash;
 	register XAssoc *bucket;