From 468b19fd8729690dc4c2d1a1f20294991949ac35 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 10 Nov 2011 22:48:12 -0800 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 | 4 ++-- Makefile.am | 6 +++--- chars.c | 24 ++++++++++++------------ configure.ac | 4 ++-- fstobdf.c | 6 +++--- fstobdf.h | 10 +++++----- header.c | 32 ++++++++++++++++---------------- props.c | 12 ++++++------ 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/COPYING b/COPYING index 1073e82..4f49603 100644 --- a/COPYING +++ b/COPYING @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Copyright 1990, 1991 Network Computing Devices; -Portions Copyright 1987 by Digital Equipment Corporation +Portions Copyright 1987 by Digital Equipment Corporation Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided @@ -69,7 +69,7 @@ XFree86 Project. 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 diff --git a/Makefile.am b/Makefile.am index 882f0a0..c4391ac 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/chars.c b/chars.c index 7d6f045..4a6fdfe 100644 --- a/chars.c +++ b/chars.c @@ -1,5 +1,5 @@ /* - + Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * Copyright 1990 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -69,11 +69,11 @@ in this Software without prior written authorization from The Open Group. static void -EmitBitmap(FILE *outFile, - FSXFontInfoHeader *fontHeader, - FSXCharInfo *charInfo, - unsigned int encoding, - int bpr, +EmitBitmap(FILE *outFile, + FSXFontInfoHeader *fontHeader, + FSXCharInfo *charInfo, + unsigned int encoding, + int bpr, unsigned char *data) { char *glyphName; @@ -148,9 +148,9 @@ EmitBitmap(FILE *outFile, Bool -EmitCharacters(FILE *outFile, - FSServer *fontServer, - FSXFontInfoHeader *fontHeader, +EmitCharacters(FILE *outFile, + FSServer *fontServer, + FSXFontInfoHeader *fontHeader, Font fontID) { FSXCharInfo *extents; @@ -172,8 +172,8 @@ EmitCharacters(FILE *outFile, format = BYTE_ORDER | BIT_ORDER | SCANLINE_UNIT | SCANLINE_PAD | EXTENTS; - firstCharLow = fontHeader->char_range.min_char.low; - firstCharHigh = fontHeader->char_range.min_char.high; + firstCharLow = fontHeader->char_range.min_char.low; + firstCharHigh = fontHeader->char_range.min_char.high; lastCharLow = fontHeader->char_range.max_char.low; lastCharHigh = fontHeader->char_range.max_char.high; diff --git a/configure.ac b/configure.ac index 54a6ad8..a937b33 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/fstobdf.c b/fstobdf.c index 2b1b160..881cefa 100644 --- a/fstobdf.c +++ b/fstobdf.c @@ -1,5 +1,5 @@ /* - + Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * Copyright 1990 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -55,7 +55,7 @@ usage(char *progName) exit(0); } -static void +static void Fail(char *progName) { fprintf(stderr, "%s: unable to dump font\n", progName); diff --git a/fstobdf.h b/fstobdf.h index 08d565a..9b87b15 100644 --- a/fstobdf.h +++ b/fstobdf.h @@ -26,13 +26,13 @@ #include -extern Bool EmitHeader ( FILE *outFile, FSXFontInfoHeader *fontHeader, - FSPropInfo *propInfo, FSPropOffset *propOffsets, +extern Bool EmitHeader ( FILE *outFile, FSXFontInfoHeader *fontHeader, + FSPropInfo *propInfo, FSPropOffset *propOffsets, unsigned char *propData ); -extern Bool EmitProperties ( FILE *outFile, FSXFontInfoHeader *fontHeader, - FSPropInfo *propInfo, FSPropOffset *propOffsets, +extern Bool EmitProperties ( FILE *outFile, FSXFontInfoHeader *fontHeader, + FSPropInfo *propInfo, FSPropOffset *propOffsets, unsigned char *propData ); -extern Bool EmitCharacters ( FILE *outFile, FSServer *fontServer, +extern Bool EmitCharacters ( FILE *outFile, FSServer *fontServer, FSXFontInfoHeader *fontHeader, Font fontID ); extern unsigned long yResolution; /* intended vertical resoultion for font */ diff --git a/header.c b/header.c index 4378d32..31814e6 100644 --- a/header.c +++ b/header.c @@ -1,5 +1,5 @@ /* - + Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * Copyright 1990 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -66,9 +66,9 @@ static const char *warning[] = static char * FindStringProperty(const char *propName, - int *propLength, - FSPropInfo *propInfo, - FSPropOffset *propOffsets, + int *propLength, + FSPropInfo *propInfo, + FSPropOffset *propOffsets, unsigned char *propData) { FSPropOffset *propOffset; @@ -83,7 +83,7 @@ FindStringProperty(const char *propName, #ifdef DEBUG char pname[256]; - memmove( pname, propData + propOffset->name.position, + memmove( pname, propData + propOffset->name.position, propOffset->name.length); pname[propOffset->name.length] = '\0'; fprintf(stderr, "prop name: %s (len %d)\n", @@ -103,9 +103,9 @@ FindStringProperty(const char *propName, static int FindNumberProperty(const char *propName, - unsigned long *propValue, - FSPropInfo *propInfo, - FSPropOffset *propOffsets, + unsigned long *propValue, + FSPropInfo *propInfo, + FSPropOffset *propOffsets, unsigned char *propData) { FSPropOffset *propOffset; @@ -132,10 +132,10 @@ FindNumberProperty(const char *propName, * FONTBOUNDINGBOX lines */ Bool -EmitHeader(FILE *outFile, - FSXFontInfoHeader *fontHeader, - FSPropInfo *propInfo, - FSPropOffset *propOffsets, +EmitHeader(FILE *outFile, + FSXFontInfoHeader *fontHeader, + FSPropInfo *propInfo, + FSPropOffset *propOffsets, unsigned char *propData) { int len; @@ -174,7 +174,7 @@ EmitHeader(FILE *outFile, /* * SIZE point xres yres - * + * * Get XLFD values if possible, else fake it */ type = FindNumberProperty("RESOLUTION_X", &xResolution, propInfo, @@ -195,12 +195,12 @@ EmitHeader(FILE *outFile, pointSize = ((fontHeader->font_ascent + fontHeader->font_descent) * 72) / yResolution; - fprintf(outFile, "SIZE %lu %lu %lu\n", pointSize, xResolution, + fprintf(outFile, "SIZE %lu %lu %lu\n", pointSize, xResolution, yResolution); /* * FONTBOUNDINGBOX width height xoff yoff - * + * */ fprintf(outFile, "FONTBOUNDINGBOX %d %d %d %d\n", fontHeader->max_bounds.right - fontHeader->min_bounds.left, diff --git a/props.c b/props.c index cd45177..465bea8 100644 --- a/props.c +++ b/props.c @@ -1,5 +1,5 @@ /* - + Copyright 1990, 1991, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * Copyright 1990, 1991 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -66,10 +66,10 @@ AddQuotes(unsigned char *string, int length) } Bool -EmitProperties(FILE *outFile, - FSXFontInfoHeader *fontHeader, - FSPropInfo *propInfo, - FSPropOffset *propOffsets, +EmitProperties(FILE *outFile, + FSXFontInfoHeader *fontHeader, + FSPropInfo *propInfo, + FSPropOffset *propOffsets, unsigned char *propData) { int nProperties; -- cgit v1.2.3