From d9200f965f056d3da49476dd9b8333ff47265f30 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 28 Sep 2011 22:00:50 -0700 Subject: Strip trailing whitespace Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith --- COPYING | 8 ++++---- Makefile.am | 6 +++--- ULabel.c | 30 +++++++++++++++--------------- ULabel.h | 8 ++++---- ULabelP.h | 12 ++++++------ app-defaults/XFontSel | 8 ++++---- configure.ac | 4 ++-- xfontsel.c | 22 +++++++++++----------- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/COPYING b/COPYING index 5fcc3a7..4a1e6f2 100644 --- a/COPYING +++ b/COPYING @@ -26,13 +26,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/Makefile.am b/Makefile.am index 38d198a..9421d38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # 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 @@ -10,7 +10,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/ULabel.c b/ULabel.c index ec7343d..285fb1c 100644 --- a/ULabel.c +++ b/ULabel.c @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -119,7 +119,7 @@ static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended, UCSLabelClassRec ucsLabelClassRec = { { -/* core_class fields */ +/* core_class fields */ /* superclass */ (WidgetClass) &simpleClassRec, /* class_name */ "UCSLabel", /* widget_size */ sizeof(UCSLabelRec), @@ -172,7 +172,7 @@ WidgetClass ucsLabelWidgetClass = (WidgetClass)&ucsLabelClassRec; static void ClassInitialize(void) { XawInitializeWidgetSet(); - XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify, + XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify, (XtConvertArgList)NULL, 0 ); } @@ -448,7 +448,7 @@ static void GetgrayGC(UCSLabelWidget lw) values.font = lw->label.font->fid; values.fill_style = FillTiled; values.tile = XmuCreateStippledPixmap(XtScreen((Widget)lw), - lw->label.foreground, + lw->label.foreground, lw->core.background_pixel, lw->core.depth); values.graphics_exposures = False; @@ -462,7 +462,7 @@ static void GetgrayGC(UCSLabelWidget lw) GCGraphicsExposures, &values, GCFont, 0); else - lw->label.gray_GC = XtGetGC((Widget)lw, + lw->label.gray_GC = XtGetGC((Widget)lw, (unsigned) GCForeground | GCBackground | GCFont | GCTile | GCFillStyle | GCGraphicsExposures, @@ -472,12 +472,12 @@ static void GetgrayGC(UCSLabelWidget lw) static void compute_bitmap_offsets(UCSLabelWidget lw) { /* - * bitmap will be eventually be displayed at + * bitmap will be eventually be displayed at * (internal_width, internal_height + lbm_y) */ if (lw->label.lbm_height != 0) { lw->label.lbm_y = (lw->core.height - - (lw->label.internal_height * 2 + + (lw->label.internal_height * 2 + lw->label.lbm_height)) / 2; } else { lw->label.lbm_y = 0; @@ -508,7 +508,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { UCSLabelWidget lw = (UCSLabelWidget) new; - if (lw->label.label == NULL) + if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); else { lw->label.label = XtNewString(lw->label.label); @@ -578,7 +578,7 @@ static void Redisplay(Widget gw, XEvent *event, Region region) XCopyPlane (XtDisplay(gw), w->label.left_bitmap, XtWindow(gw), gc, 0, 0, w->label.lbm_width, w->label.lbm_height, (int) w->label.internal_width, - (int) w->label.internal_height + w->label.lbm_y, + (int) w->label.internal_height + w->label.lbm_y, (unsigned long) 1L); } @@ -617,7 +617,7 @@ static void Redisplay(Widget gw, XEvent *event, Region region) else XDrawString(XtDisplay(gw), XtWindow(gw), gc, w->label.label_x, y, label, (int)(nl - label)); - y += w->label.font->max_bounds.ascent + + y += w->label.font->max_bounds.ascent + w->label.font->max_bounds.descent; label = nl + 1; } @@ -818,10 +818,10 @@ QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred) UCSLabelWidget lw = (UCSLabelWidget)w; preferred->request_mode = CWWidth | CWHeight; - preferred->width = (lw->label.label_width + + preferred->width = (lw->label.label_width + 2 * lw->label.internal_width + LEFT_OFFSET(lw)); - preferred->height = lw->label.label_height + + preferred->height = lw->label.label_height + 2 * lw->label.internal_height; if ( ((intended->request_mode & (CWWidth | CWHeight)) == (CWWidth | CWHeight)) && diff --git a/ULabel.h b/ULabel.h index f274ddc..7ee70f0 100644 --- a/ULabel.h +++ b/ULabel.h @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/ULabelP.h b/ULabelP.h index b88a7f8..d25acb9 100644 --- a/ULabelP.h +++ b/ULabelP.h @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ -/* +/* * ULabelP.h - Private definitions for UCSLabel widget - * + * */ #ifndef _XawUCSLabelP_h diff --git a/app-defaults/XFontSel b/app-defaults/XFontSel index 73c4854..b0ef993 100644 --- a/app-defaults/XFontSel +++ b/app-defaults/XFontSel @@ -3,7 +3,7 @@ ! app-defaults for XFontSel ! ! Copyright (c) 1985, 1986, 1987, 1988, 1989 X Consortium -! +! ! Permission is hereby granted, free of charge, to any person obtaining ! a copy of this software and associated documentation files (the ! "Software"), to deal in the Software without restriction, including @@ -11,10 +11,10 @@ ! distribute, sublicense, and/or sell copies of the Software, and to ! permit persons to whom the Software is furnished to do so, subject to ! the following conditions: -! +! ! 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. @@ -22,7 +22,7 @@ ! 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 X Consortium shall ! not be used in advertising or otherwise to promote the sale, use or ! other dealings in this Software without prior written authorization diff --git a/configure.ac b/configure.ac index fe5dd08..c697221 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/xfontsel.c b/xfontsel.c index efa01c8..47ece7b 100644 --- a/xfontsel.c +++ b/xfontsel.c @@ -154,19 +154,19 @@ static void Syntax(char *call) fprintf (stderr, "where options include:\n"); fprintf (stderr, " -display dpy X server to contact\n"); - fprintf (stderr, + fprintf (stderr, " -geometry geom size and location of window\n"); - fprintf (stderr, + fprintf (stderr, " -pattern fontspec font name pattern to match against\n"); - fprintf (stderr, + fprintf (stderr, " -print print selected font name on exit\n"); - fprintf (stderr, + fprintf (stderr, " -sample string sample text to use for 1-byte fonts\n"); - fprintf (stderr, + fprintf (stderr, " -sample16 string sample text to use for 2-byte fonts\n"); fprintf (stderr, " -sampleUCS string sample text to use for ISO10646 fonts\n"); - fprintf (stderr, + fprintf (stderr, " -scaled use scaled instances of fonts\n"); fprintf (stderr, "\n"); exit (1); @@ -346,7 +346,7 @@ see 'xfontsel' manual page." XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ); } } - + XtRealizeWidget(topLevel); XDefineCursor( XtDisplay(topLevel), XtWindow(topLevel), AppRes.cursor ); { @@ -513,7 +513,7 @@ void GetFontNames(XtPointer closure) } } else - XtAppWarning( appCtx, + XtAppWarning( appCtx, "internal error; pattern didn't match first font" ); } else { @@ -594,7 +594,7 @@ void ParseFontNames(XtPointer closure) fontValues->value_index[f] = fieldValues[f]->count - i; if ((i = v->count++) == v->allocated) { int allocated = (v->allocated += 10); - v->font = (int*)XtRealloc( (char *) v->font, + v->font = (int*)XtRealloc( (char *) v->font, allocated * sizeof(int) ); } v->font[i] = font - numBadFonts; @@ -932,7 +932,7 @@ Boolean Matches(register String pattern, register String fontName, marked_this_field = False; } else if (!marked_this_field) - fields[field] = marked_this_field = True; + fields[field] = marked_this_field = True; continue; } if (*pattern == '*') { @@ -990,7 +990,7 @@ void SelectValue(Widget w, XtPointer closure, XtPointer callData) choice->prev = choiceList; choice->value = val; choiceList = choice; - + SetCurrentFont(NULL); EnableRemainingItems(SkipCurrentField); } -- cgit v1.2.3