merge XFree86 4.3.0.1 to -CURRENTXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

2 files changed, 19 insertions, 20 deletions

diff --git a/xrefresh.c b/xrefresh.c
index 06500a3..b857ef8 100644
--- a/xrefresh.c
+++ b/xrefresh.c
@@ -51,6 +51,7 @@ SOFTWARE.
  * Kitchen sink version, useful for clearing small areas and flashing the 
  * screen.
  */
+/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.6 2001/12/14 20:02:15 dawes Exp $ */
 
 #include <stdio.h>
 #include <errno.h>
@@ -58,14 +59,14 @@ SOFTWARE.
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <ctype.h>
-
-char *malloc();
+#include <stdlib.h>
 
 Window win;
 
 char *ProgramName;
 
-void Syntax ()
+static void 
+Syntax(void)
 {
     fprintf (stderr, "usage:  %s [-options] [geometry] [display]\n\n", 
     	     ProgramName);
@@ -81,11 +82,10 @@ void Syntax ()
     exit (1);
 }
 
-static char *copystring (s)
-    register char *s;
+static char *
+copystring(char *s)
 {
     int len = (s ? strlen (s) : 0) + 1;
-    char *malloc();
     char *retval;
 
     retval = malloc (len);
@@ -103,8 +103,8 @@ static char *copystring (s)
  * for error, no, yes.
  */
 
-static int parse_boolean_option (option)
-    register char *option;
+static int 
+parse_boolean_option(char *option)
 {
     static struct _booltable {
         char *name;
@@ -132,10 +132,8 @@ static int parse_boolean_option (option)
  * whether or not the given string is an abbreviation of the arg.
  */
 
-static Bool isabbreviation (arg, s, minslen)
-    char *arg;
-    char *s;
-    int minslen;
+static Bool 
+isabbreviation(char *arg, char *s, int minslen)
 {
     int arglen;
     int slen;
@@ -169,10 +167,8 @@ struct s_pair {
 	{ "Root", doRoot },
 	{ NULL, doDefault }};
 
-
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
     Visual visual;
     XSetWindowAttributes xswa;
diff --git a/xrefresh.man b/xrefresh.man
index f2e61a2..84c815f 100644
--- a/xrefresh.man
+++ b/xrefresh.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 XREFRESH 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.8 2001/12/14 20:02:15 dawes Exp $
+.\"
+.TH XREFRESH 1 __xorgversion__
 .SH NAME
 xrefresh - refresh all or part of an X screen
 .SH SYNOPSIS
@@ -68,12 +71,12 @@ This is the default.  All of the windows simply repaint.
 .PP
 .TP 10
 .B \-geometry \fIWxH+X+Y\fP
-Specifies the portion of the screen to be repainted; see \fIX(1)\fP.
+Specifies the portion of the screen to be repainted; see \fIX(__miscmansuffix__)\fP.
 .PP
 .TP 10
 .B \-display \fIdisplay\fP
 This  argument  allows  you  to  specify the server and screen to
-refresh; see \fIX(1)\fP.
+refresh; see \fIX(__miscmansuffix__)\fP.
 .SH X DEFAULTS
 The
 .I xrefresh
@@ -93,7 +96,7 @@ Determines the area to refresh.  Not very useful.
 .TP 8
 DISPLAY - To get default host and display number.
 .SH SEE ALSO
-X(1)
+X(__miscmansuffix__)
 .SH BUGS
 .PP
 It should have just one default type for the background.