merge XFree86 4.3.0.1 to -CURRENT

2 files changed, 24 insertions, 18 deletions

diff --git a/appres.c b/appres.c
index b2fc9e3..d5c96d2 100644
--- a/appres.c
+++ b/appres.c
@@ -27,8 +27,11 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Jim Fulton, MIT X Consortium
  */
 
+/* $XFree86: xc/programs/appres/appres.c,v 1.4 2001/12/14 20:00:38 dawes Exp $ */
+
 #include <X11/Intrinsic.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define NONAME "-AppResTest-"
 
@@ -36,7 +39,8 @@ char *ProgramName;
 
 XrmQuark XrmQString;
 
-static void usage ()
+static void 
+usage (void)
 {
     fprintf (stderr,
 	     "usage:  %s  [class [instance]] [-1] [toolkitoptions]\n",
@@ -49,10 +53,10 @@ static void usage ()
 }
 
 /* stolen from Xlib Xrm.c */
-static void PrintBindingQuarkList(bindings, quarks, stream)
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    FILE		*stream;
+static void 
+PrintBindingQuarkList(XrmBindingList bindings, 
+				  XrmQuarkList quarks,
+				  FILE* stream)
 {
     Bool	firstNameSeen;
 
@@ -70,13 +74,13 @@ static void PrintBindingQuarkList(bindings, quarks, stream)
 /* stolen from Xlib Xrm.c */
 /* output out the entry in correct file syntax */
 /*ARGSUSED*/
-static Bool DumpEntry(db, bindings, quarks, type, value, data)
-    XrmDatabase		*db;
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    XrmRepresentation   *type;
-    XrmValuePtr		value;
-    XPointer		data;
+static Bool 
+DumpEntry(XrmDatabase *db, 
+	  XrmBindingList bindings, 
+	  XrmQuarkList quarks, 
+	  XrmRepresentation *type, 
+	  XrmValuePtr value, 
+	  XPointer data)
 {
     FILE			*stream = (FILE *)data;
     register unsigned int	i;
@@ -116,9 +120,8 @@ static Bool DumpEntry(db, bindings, quarks, type, value, data)
     return False;
 }
 
-main (argc, argv)
-    int argc;
-    char **argv;
+int
+main (int argc, char *argv[])
 {
     Widget toplevel;
     char *iname = NONAME, *cname = NONAME;
@@ -171,5 +174,5 @@ main (argc, argv)
 			 names, classes, mode,
 			 DumpEntry, (XPointer)stdout);
 
-    exit (0);
+    return (0);
 }
diff --git a/appres.man b/appres.man
index 8a59e78..5d03bb4 100644
--- a/appres.man
+++ b/appres.man
@@ -22,7 +22,10 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH APPRES 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/appres/appres.man,v 1.8 2001/12/14 20:00:38 dawes Exp $
+.\"
+.TH APPRES 1 __xorgversion__
 .SH NAME
 appres \- list X application resource database
 .SH SYNOPSIS
@@ -84,6 +87,6 @@ use the \-1 option.  For example,
 will list the resources matching the \fIxterm\fP vt100 widget.
 .SH "SEE ALSO"
 .PP
-X(1), xrdb(1), listres(1)
+X(__miscmansuffix__), xrdb(1), listres(1)
 .SH AUTHOR
 Jim Fulton, MIT X Consortium