diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:21:21 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:21:21 -0700 |
commit | 098ab294deed98371ee362fadafcf2e510e0cc50 (patch) | |
tree | 8ac9b280165a108d762f5de995782d172b7dbf75 /include | |
parent | 211368b8d04ed13ba520de2dd49a875cb1d663a7 (diff) |
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 <alan.coopersmith@oracle.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/X11/fonts/bdfint.h | 10 | ||||
-rw-r--r-- | include/X11/fonts/bitmap.h | 18 | ||||
-rw-r--r-- | include/X11/fonts/fntfil.h | 92 | ||||
-rw-r--r-- | include/X11/fonts/fntfilst.h | 38 | ||||
-rw-r--r-- | include/X11/fonts/fontmisc.h | 6 | ||||
-rw-r--r-- | include/X11/fonts/fontutil.h | 10 | ||||
-rw-r--r-- | include/X11/fonts/pcf.h | 2 |
7 files changed, 88 insertions, 88 deletions
diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h index 913f660..a8d8459 100644 --- a/include/X11/fonts/bdfint.h +++ b/include/X11/fonts/bdfint.h @@ -67,21 +67,21 @@ typedef struct BDFSTAT { extern void bdfError ( char * message, ... ); extern void bdfWarning ( char *message, ... ); -extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, +extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, int len ); extern Atom bdfForceMakeAtom ( char *str, int *size ); extern Atom bdfGetPropertyValue ( char *s ); extern int bdfIsInteger ( char *str ); extern unsigned char bdfHexByte ( unsigned char *s ); -extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, +extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, char isString, bdfFileState *bdfState ); -extern int bdfReadFont( FontPtr pFont, FontFilePtr file, +extern int bdfReadFont( FontPtr pFont, FontFilePtr file, int bit, int byte, int glyph, int scan ); extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file ); -extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, +extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, xCharInfo *pInk ); -extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, +extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, CharInfoPtr pDst ); #endif /* BDFINT_H */ diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index c023427..7309ac6 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -74,10 +74,10 @@ typedef struct _BitmapFont { #define NUM_SEGMENTS(n) \ (((n)+BITMAP_FONT_SEGMENT_SIZE-1)/BITMAP_FONT_SEGMENT_SIZE) -extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count, - unsigned char *chars, FontEncoding charEncoding, +extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count, + unsigned char *chars, FontEncoding charEncoding, unsigned long *glyphCount, CharInfoPtr *glyphs ); -extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, +extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, unsigned char *chars, FontEncoding charEncoding, unsigned long *glyphCount, xCharInfo **glyphs ); @@ -88,14 +88,14 @@ extern int bitmapComputeWeight ( FontPtr pFont ); extern void BitmapRegisterFontFileFunctions ( void ); -extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, +extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, int flags, FontEntryPtr entry, char *fileName, - FontScalablePtr vals, fsBitmapFormat format, - fsBitmapFormatMask fmask, + FontScalablePtr vals, fsBitmapFormat format, + fsBitmapFormatMask fmask, FontPtr non_cachable_font ); -extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, - FontInfoPtr pFontInfo, FontEntryPtr entry, - FontNamePtr fontName, char *fileName, +extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, + FontInfoPtr pFontInfo, FontEntryPtr entry, + FontNamePtr fontName, char *fileName, FontScalablePtr vals ); #endif /* _BITMAP_H_ */ diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h index 25d1f30..feefdb3 100644 --- a/include/X11/fonts/fntfil.h +++ b/include/X11/fonts/fntfil.h @@ -76,62 +76,62 @@ extern int FontFileNameCheck ( char *name ); extern int FontFileInitFPE ( FontPathElementPtr fpe ); extern int FontFileResetFPE ( FontPathElementPtr fpe ); extern int FontFileFreeFPE ( FontPathElementPtr fpe ); -extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe, - Mask flags, char *name, int namelen, - fsBitmapFormat format, fsBitmapFormatMask fmask, - XID id, FontPtr *pFont, char **aliasName, +extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe, + Mask flags, char *name, int namelen, + fsBitmapFormat format, fsBitmapFormatMask fmask, + XID id, FontPtr *pFont, char **aliasName, FontPtr non_cachable_font ); extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont ); -extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, - int flags, FontEntryPtr entry, - fsBitmapFormat format, +extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, + int flags, FontEntryPtr entry, + fsBitmapFormat format, fsBitmapFormatMask fmask ); -extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, - char *pat, int len, int max, +extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, + char *pat, int len, int max, FontNamesPtr names ); -extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, - char *pat, int len, int max, +extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, + char *pat, int len, int max, pointer *privatep, int mark_aliases ); -extern int FontFileStartListFontsWithInfo ( pointer client, - FontPathElementPtr fpe, - char *pat, int len, int max, +extern int FontFileStartListFontsWithInfo ( pointer client, + FontPathElementPtr fpe, + char *pat, int len, int max, pointer *privatep ); -extern int FontFileListNextFontWithInfo ( pointer client, - FontPathElementPtr fpe, - char **namep, int *namelenp, - FontInfoPtr *pFontInfo, +extern int FontFileListNextFontWithInfo ( pointer client, + FontPathElementPtr fpe, + char **namep, int *namelenp, + FontInfoPtr *pFontInfo, int *numFonts, pointer private ); -extern int FontFileStartListFontsAndAliases ( pointer client, - FontPathElementPtr fpe, - char *pat, int len, int max, +extern int FontFileStartListFontsAndAliases ( pointer client, + FontPathElementPtr fpe, + char *pat, int len, int max, pointer *privatep ); -extern int FontFileListNextFontOrAlias ( pointer client, - FontPathElementPtr fpe, - char **namep, int *namelenp, - char **resolvedp, int *resolvedlenp, +extern int FontFileListNextFontOrAlias ( pointer client, + FontPathElementPtr fpe, + char **namep, int *namelenp, + char **resolvedp, int *resolvedlenp, pointer private ); extern void FontFileRegisterLocalFpeFunctions ( void ); extern void CatalogueRegisterLocalFpeFunctions ( void ); -extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, +extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, FontEntryPtr prototype ); -extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName, +extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName, char *fontName ); -extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName, +extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName, char *fileName ); extern int FontFileCountDashes ( char *name, int namelen ); -extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table, +extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table, FontNamePtr pat ); extern FontEntryPtr FontFileFindNameInScalableDir ( FontTablePtr table, - FontNamePtr pat, + FontNamePtr pat, FontScalablePtr vals ); -extern int FontFileFindNamesInDir ( FontTablePtr table, FontNamePtr pat, +extern int FontFileFindNamesInDir ( FontTablePtr table, FontNamePtr pat, int max, FontNamesPtr names ); -extern int FontFileFindNamesInScalableDir ( FontTablePtr table, - FontNamePtr pat, int max, - FontNamesPtr names, - FontScalablePtr vals, +extern int FontFileFindNamesInScalableDir ( FontTablePtr table, + FontNamePtr pat, int max, + FontNamesPtr names, + FontScalablePtr vals, int alias_behavior, int *newmax ); extern void FontFileFreeDir ( FontDirectoryPtr dir ); @@ -151,26 +151,26 @@ extern Bool FontFilePriorityRegisterRenderer ( FontRendererPtr renderer, int priority ); extern FontRendererPtr FontFileMatchRenderer ( char *fileName ); -extern Bool FontFileAddScaledInstance ( FontEntryPtr entry, - FontScalablePtr vals, FontPtr pFont, +extern Bool FontFileAddScaledInstance ( FontEntryPtr entry, + FontScalablePtr vals, FontPtr pFont, char *bitmapName ); extern void FontFileSwitchStringsToBitmapPointers ( FontDirectoryPtr dir ); extern void FontFileRemoveScaledInstance ( FontEntryPtr entry, FontPtr pFont ); extern Bool FontFileCompleteXLFD ( FontScalablePtr vals, FontScalablePtr def ); -extern FontScaledPtr FontFileFindScaledInstance ( FontEntryPtr entry, - FontScalablePtr vals, +extern FontScaledPtr FontFileFindScaledInstance ( FontEntryPtr entry, + FontScalablePtr vals, int noSpecificSize ); extern Bool FontFileRegisterBitmapSource ( FontPathElementPtr fpe ); extern void FontFileUnregisterBitmapSource ( FontPathElementPtr fpe ); extern void FontFileEmptyBitmapSource ( void ); -extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe, - FontPtr *pFont, int flags, - FontEntryPtr entry, - FontNamePtr zeroPat, - FontScalablePtr vals, - fsBitmapFormat format, - fsBitmapFormatMask fmask, +extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe, + FontPtr *pFont, int flags, + FontEntryPtr entry, + FontNamePtr zeroPat, + FontScalablePtr vals, + fsBitmapFormat format, + fsBitmapFormatMask fmask, Bool noSpecificSize ); extern int FontFileReadDirectory ( char *directory, FontDirectoryPtr *pdir ); diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h index 29e0a56..8926f95 100644 --- a/include/X11/fonts/fntfilst.h +++ b/include/X11/fonts/fntfilst.h @@ -126,32 +126,32 @@ typedef struct _FontDirectory { typedef struct _FontRenderer { char *fileSuffix; int fileSuffixLen; - int (*OpenBitmap)(FontPathElementPtr /* fpe */, + int (*OpenBitmap)(FontPathElementPtr /* fpe */, FontPtr * /* pFont */, - int /* flags */, - FontEntryPtr /* entry */, - char * /* fileName */, - fsBitmapFormat /* format */, + int /* flags */, + FontEntryPtr /* entry */, + char * /* fileName */, + fsBitmapFormat /* format */, fsBitmapFormatMask /* mask */, FontPtr /* non_cachable_font */); - int (*OpenScalable)(FontPathElementPtr /* fpe */, - FontPtr * /* pFont */, - int /* flags */, - FontEntryPtr /* entry */, - char * /* fileName */, - FontScalablePtr /* vals */, - fsBitmapFormat /* format */, + int (*OpenScalable)(FontPathElementPtr /* fpe */, + FontPtr * /* pFont */, + int /* flags */, + FontEntryPtr /* entry */, + char * /* fileName */, + FontScalablePtr /* vals */, + fsBitmapFormat /* format */, fsBitmapFormatMask /* fmask */, FontPtr /* non_cachable_font */); - int (*GetInfoBitmap)(FontPathElementPtr /* fpe */, - FontInfoPtr /* pFontInfo */, - FontEntryPtr /* entry */, + int (*GetInfoBitmap)(FontPathElementPtr /* fpe */, + FontInfoPtr /* pFontInfo */, + FontEntryPtr /* entry */, char * /*fileName */); - int (*GetInfoScalable)(FontPathElementPtr /* fpe */, - FontInfoPtr /* pFontInfo */, - FontEntryPtr /* entry */, + int (*GetInfoScalable)(FontPathElementPtr /* fpe */, + FontInfoPtr /* pFontInfo */, + FontEntryPtr /* entry */, FontNamePtr /* fontName */, - char * /* fileName */, + char * /* fileName */, FontScalablePtr /* vals */); int number; int capabilities; /* Bitmap components defined above */ diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h index cd9d52a..3da1e63 100644 --- a/include/X11/fonts/fontmisc.h +++ b/include/X11/fonts/fontmisc.h @@ -81,11 +81,11 @@ FourByteSwap( extern int RepadBitmap ( - char*, char*, - unsigned, + char*, + unsigned, unsigned, - int, + int, int ); diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h index 71d507b..ed55b89 100644 --- a/include/X11/fonts/fontutil.h +++ b/include/X11/fonts/fontutil.h @@ -8,17 +8,17 @@ extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *, int *, int *, int *); extern void FontComputeInfoAccelerators(FontInfoPtr); -extern void GetGlyphs ( FontPtr font, unsigned long count, - unsigned char *chars, FontEncoding fontEncoding, +extern void GetGlyphs ( FontPtr font, unsigned long count, + unsigned char *chars, FontEncoding fontEncoding, unsigned long *glyphcount, CharInfoPtr *glyphs ); -extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo, +extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo, unsigned long count, ExtentInfoRec *info ); -extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count, +extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count, unsigned char *chars, ExtentInfoRec *info ); extern Bool ParseGlyphCachingMode ( char *str ); extern void InitGlyphCaching ( void ); extern void SetGlyphCachingMode ( int newmode ); -extern int add_range ( fsRange *newrange, int *nranges, fsRange **range, +extern int add_range ( fsRange *newrange, int *nranges, fsRange **range, Bool charset_subset ); #endif /* _FONTUTIL_H_ */ diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h index a5fdbcd..3d47c66 100644 --- a/include/X11/fonts/pcf.h +++ b/include/X11/fonts/pcf.h @@ -88,7 +88,7 @@ typedef struct _PCFTable { #define PCF_GLYPH_NAMES (1<<7) #define PCF_BDF_ACCELERATORS (1<<8) -extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, +extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, int bit, int byte, int glyph, int scan ); extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file ); extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file ); |