Strip old CVS id tags and trailing whitespaces

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

9 files changed, 52 insertions, 73 deletions

diff --git a/Logo.c b/Logo.c
index cd5b113..da5d7ae 100644
--- a/Logo.c
+++ b/Logo.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: xc/programs/xlogo/Logo.c,v 1.2 2004/04/23 19:54:57 eich Exp $ */
-/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
 /*
 
 Copyright 1988, 1994, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/Logo.c,v 1.6 2002/05/23 23:53:59 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -45,7 +42,7 @@ from The Open Group.
 
 static XtResource resources[] = {
     {XtNshapeWindow, XtCShapeWindow, XtRBoolean, sizeof (Boolean),
-       XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate, 
+       XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate,
        (XtPointer) FALSE},
 #ifdef XRENDER
     {XtNrender, XtCBoolean, XtRBoolean, sizeof(Boolean),
@@ -68,14 +65,14 @@ static XtResource resources[] = {
 };
 
 static void ClassInitialize ( void );
-static void Initialize ( Widget request, Widget new, ArgList args, 
+static void Initialize ( Widget request, Widget new, ArgList args,
 			 Cardinal *num_args );
 static void Destroy ( Widget gw );
-static void Realize ( Widget gw, XtValueMask *valuemaskp, 
+static void Realize ( Widget gw, XtValueMask *valuemaskp,
 		      XSetWindowAttributes *attr );
 static void Resize ( Widget gw );
 static void Redisplay ( Widget gw, XEvent *event, Region region );
-static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew, 
+static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
 			   ArgList args, Cardinal *num_args );
 
 LogoClassRec logoClassRec = {
@@ -130,7 +127,7 @@ WidgetClass logoWidgetClass = (WidgetClass) &logoClassRec;
  *									     *
  *****************************************************************************/
 
-static void 
+static void
 create_gcs(LogoWidget w)
 {
     XGCValues v;
@@ -145,7 +142,7 @@ create_gcs(LogoWidget w)
     w->logo.backGC = XtGetGC ((Widget) w, GCForeground, &v);
 }
 
-static void 
+static void
 check_shape(LogoWidget w)
 {
     if (w->logo.shape_window) {
@@ -157,7 +154,7 @@ check_shape(LogoWidget w)
 }
 
 /* ARGSUSED */
-static void 
+static void
 unset_shape(LogoWidget w)
 {
     XSetWindowAttributes attr;
@@ -165,7 +162,7 @@ unset_shape(LogoWidget w)
     Display *dpy = XtDisplay ((Widget) w);
     Window win = XtWindow ((Widget) w);
 
-    if (w->core.background_pixmap != None && 
+    if (w->core.background_pixmap != None &&
 	w->core.background_pixmap != XtUnspecifiedPixmap) {
 	attr.background_pixmap = w->core.background_pixmap;
 	mask = CWBackPixmap;
@@ -179,7 +176,7 @@ unset_shape(LogoWidget w)
     w->logo.need_shaping = w->logo.shape_window;
 }
 
-static void 
+static void
 set_shape(LogoWidget w)
 {
     GC ones, zeros;
@@ -273,7 +270,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
     Screen	*screen;
     Colormap	colormap;
     XftColor	*color;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (app,
@@ -292,7 +289,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
 				 XScreenNumberOfScreen (screen)),
 		  colormap, color);
 }
-    
+
 static Boolean
 XmuCvtStringToXftColor(Display *dpy,
 		       XrmValue *args, Cardinal *num_args,
@@ -304,7 +301,7 @@ XmuCvtStringToXftColor(Display *dpy,
     XftColor	    xftColor;
     Screen	    *screen;
     Colormap	    colormap;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
@@ -335,33 +332,33 @@ XmuCvtStringToXftColor(Display *dpy,
     }
     else if (!XRenderParseColor (dpy, spec, &renderColor))
 	return False;
-    if (!XftColorAllocValue (dpy, 
+    if (!XftColorAllocValue (dpy,
 			     DefaultVisual (dpy,
 					    XScreenNumberOfScreen (screen)),
 			     colormap,
 			     &renderColor,
 			     &xftColor))
 	return False;
-    
+
     donestr (XftColor, xftColor, XtRXftColor);
 }
 
 
 #endif
 
-static void 
+static void
 ClassInitialize(void)
 {
 #ifdef XRENDER
-    XtSetTypeConverter (XtRString, XtRXftColor, 
-			XmuCvtStringToXftColor, 
+    XtSetTypeConverter (XtRString, XtRXftColor,
+			XmuCvtStringToXftColor,
 			xftColorConvertArgs, XtNumber(xftColorConvertArgs),
 			XtCacheByDisplay, XmuFreeXftColor);
 #endif
 }
 
 /* ARGSUSED */
-static void 
+static void
 Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
 {
     LogoWidget w = (LogoWidget)new;
@@ -379,7 +376,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
     w->logo.need_shaping = w->logo.shape_window;
 }
 
-static void 
+static void
 Destroy(Widget gw)
 {
     LogoWidget w = (LogoWidget) gw;
@@ -393,7 +390,7 @@ Destroy(Widget gw)
     }
 }
 
-static void 
+static void
 Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr)
 {
     LogoWidget w = (LogoWidget) gw;
@@ -407,7 +404,7 @@ Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr)
 	(gw, valuemaskp, attr);
 }
 
-static void 
+static void
 Resize(Widget gw)
 {
     LogoWidget w = (LogoWidget) gw;
@@ -416,7 +413,7 @@ Resize(Widget gw)
 }
 
 /* ARGSUSED */
-static void 
+static void
 Redisplay(Widget gw, XEvent *event, Region region)
 {
     LogoWidget w = (LogoWidget) gw;
@@ -452,8 +449,8 @@ Redisplay(Widget gw, XEvent *event, Region region)
 }
 
 /* ARGSUSED */
-static Boolean 
-SetValues (Widget gcurrent, Widget grequest, Widget gnew, 
+static Boolean
+SetValues (Widget gcurrent, Widget grequest, Widget gnew,
 	   ArgList args, Cardinal *num_args)
 {
     LogoWidget current = (LogoWidget) gcurrent;
@@ -470,7 +467,7 @@ SetValues (Widget gcurrent, Widget grequest, Widget gnew,
 	if (!new->logo.shape_window) create_gcs (new);
 	redisplay = TRUE;
     }
-   
+
    if (new->logo.shape_window != current->logo.shape_window) {
        if (new->logo.shape_window) {
 	   Destroy (gnew);
diff --git a/Logo.h b/Logo.h
index c8c29fb..89cdf59 100644
--- a/Logo.h
+++ b/Logo.h
@@ -1,4 +1,3 @@
-/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
 /*
 
 Copyright 1988, 1990, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86$ */
 
 #ifndef _XawLogo_h
 #define _XawLogo_h
diff --git a/LogoP.h b/LogoP.h
index e86c52c..6502b66 100644
--- a/LogoP.h
+++ b/LogoP.h
@@ -1,4 +1,3 @@
-/* $Xorg: LogoP.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
 /*
 
 Copyright 1988, 1993, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86$ */
 
 #ifndef _XawLogoP_h
 #define _XawLogoP_h
diff --git a/Makefile.am b/Makefile.am
index 191bfb6..78f68b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-# 
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -11,7 +9,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/RenderLogo.c b/RenderLogo.c
index 886826d..a7963fb 100644
--- a/RenderLogo.c
+++ b/RenderLogo.c
@@ -1,5 +1,3 @@
-/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,14 +23,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.3tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdio.h>
 
-#include <X11/Xlib.h>  
+#include <X11/Xlib.h>
 #include <X11/extensions/Xrender.h>
 
 #include "RenderLogo.h"
@@ -124,7 +121,7 @@ RenderLogo(Display *dpy, int op, Picture src, Picture dst, XRenderPictFormat *ma
 static double
 compute_inverse_slope (XLineDouble *l)
 {
-    return ((l->p2.x - l->p1.x) / 
+    return ((l->p2.x - l->p1.x) /
 	    (l->p2.y - l->p1.y));
 }
 
diff --git a/RenderLogo.h b/RenderLogo.h
index e695d77..386f830 100644
--- a/RenderLogo.h
+++ b/RenderLogo.h
@@ -1,4 +1,3 @@
-/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
 /*
 
 Copyright 1988, 1990, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86$ */
 
 #ifndef _RenderLogo_h
 #define _RenderLogo_h
diff --git a/xlogo.c b/xlogo.c
index 9e9227e..2eee354 100644
--- a/xlogo.c
+++ b/xlogo.c
@@ -1,6 +1,5 @@
 /*
- * $Xorg: xlogo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $
- *
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,10 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of The Open Group shall 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.
- *
- */
 
-/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -106,13 +103,13 @@ static String fallback_resources[] = {
     NULL,
 };
 
-static void 
+static void
 die(Widget w, XtPointer client_data, XtPointer call_data)
 {
     XtAppSetExitFlag(XtWidgetToApplicationContext(w));
 }
 
-static void 
+static void
 save(Widget w, XtPointer client_data, XtPointer call_data)
 {
     return;
@@ -122,7 +119,7 @@ save(Widget w, XtPointer client_data, XtPointer call_data)
  * Report the syntax for calling xlogo.
  */
 
-static void 
+static void
 Syntax(Widget toplevel)
 {
     Arg arg;
@@ -146,7 +143,7 @@ Syntax(Widget toplevel)
 
     XtSetArg(arg, XtNconnection, &connection);
     XtGetValues(toplevel, &arg, (Cardinal)1);
-    if (connection) 
+    if (connection)
 	SmcCloseConnection(connection, n, reasons);
     else {
 	for (i=0; i < n; i++)
@@ -155,7 +152,7 @@ Syntax(Widget toplevel)
     exit(EXIT_FAILURE);
 }
 
-int 
+int
 main(int argc, char *argv[])
 {
     Widget toplevel;
@@ -164,13 +161,13 @@ main(int argc, char *argv[])
     ProgramName = argv[0];
 
     toplevel = XtOpenApplication(&app_con, "XLogo",
-				 options, XtNumber(options), 
+				 options, XtNumber(options),
 				 &argc, argv, fallback_resources,
 				 sessionShellWidgetClass, NULL, ZERO);
     if (argc != 1)
 	Syntax(toplevel);
 
-    XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources, 
+    XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources,
                               XtNumber(resources), NULL, 0);
 
     XtAppAddActions(app_con, actions, XtNumber(actions));
@@ -200,12 +197,12 @@ main(int argc, char *argv[])
 }
 
 /*ARGSUSED*/
-static void 
+static void
 quit(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     Arg arg;
-    
-    if (event->type == ClientMessage && 
+
+    if (event->type == ClientMessage &&
 	(Atom)event->xclient.data.l[0] != wm_delete_window) {
 #ifdef XKB
 	XkbStdBell(XtDisplay(w), XtWindow(w), 0, XkbBI_BadValue);
@@ -222,7 +219,7 @@ quit(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 #ifdef INCLUDE_XPRINT_SUPPORT
 /*ARGSUSED*/
-static void 
+static void
 print(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     DoPrint(w, userOptions.printername, userOptions.printfile);
diff --git a/xlogo.h b/xlogo.h
index f3fa722..24b5f9f 100644
--- a/xlogo.h
+++ b/xlogo.h
@@ -1,6 +1,5 @@
 /*
- * $Xorg: xlogo.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
- *
+
 Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of The Open Group shall 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.
- *
+
  */
 
 #ifndef XLOGO_XLOGO_H
diff --git a/xlogo.man b/xlogo.man
index df5ca66..82b809f 100644
--- a/xlogo.man
+++ b/xlogo.man
@@ -1,15 +1,14 @@
-.\" $Xorg: xlogo.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $
 .\" Copyright 1988, 1994, 1998  The Open Group
-.\" 
+.\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
 .\" copyright notice and this permission notice appear in supporting
 .\" documentation.
-.\" 
+.\"
 .\" The above copyright notice and this permission notice shall be included
 .\" in all copies or substantial portions of the Software.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -17,14 +16,12 @@
 .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 .\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
+.\"
 .\" Except as contained in this notice, the name of The Open Group shall
 .\" 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.
 .\"
-.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.10 2002/10/12 16:06:48 herrb Exp $
-.\"
 .TH XLOGO 1 __xorgversion__
 .SH NAME
 xlogo - X Window System logo
@@ -55,10 +52,10 @@ understands all of the Simple widget resource names and classes as well as:
 .B foreground (\fPclass\fB Foreground)
 Specifies the color for the logo.  The default is depends on whether
 \fIreverseVideo\fP is specified.  If \fIreverseVideo\fP is specified
-the default is \fIXtDefaultForeground\fP, otherwise the default is 
+the default is \fIXtDefaultForeground\fP, otherwise the default is
 \fIXtDefaultBackground\fP.
 .TP 8
-.B shapeWindow (\fPclass\fB ShapeWindow) 
+.B shapeWindow (\fPclass\fB ShapeWindow)
 Specifies that the window is shaped to the X logo.  The default is False.
 .SH WIDGETS
 In order to specify resources, it is useful to know the hierarchy of
@@ -67,8 +64,8 @@ indentation indicates hierarchical structure.  The widget class name
 is given first, followed by the widget instance name.
 .sp
 .nf
-.TA .5i 
-.ta .5i 
+.TA .5i
+.ta .5i
 XLogo  xlogo
 	Logo  xlogo
 .fi