1 files changed, 81 insertions, 56 deletions
diff --git a/hw/xfree86/loader/fontsym.c b/hw/xfree86/loader/fontsym.c
index 50def63ea..d91a2e216 100644
--- a/hw/xfree86/loader/fontsym.c
+++ b/hw/xfree86/loader/fontsym.c
@@ -1,4 +1,30 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.11 2002/12/09 17:30:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.13 2003/10/15 16:29:04 dawes Exp $ */
+/*
+ * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
+ *
+ * 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 without limitation
+ * the rights to use, copy, modify, merge, publish, 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.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * 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 copyright holder(s)
+ * and author(s) 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 copyright holder(s) and author(s).
+ */
 
 #include "font.h"
 #include "sym.h"
@@ -16,64 +42,63 @@
 
 LOOKUP fontLookupTab[] = {
 
-  SYMFUNC(TwoByteSwap)
-  SYMFUNC(FourByteSwap)
-  SYMFUNC(FontCouldBeTerminal)
-  SYMFUNC(BufFileRead)
-  SYMFUNC(BufFileWrite)
-  SYMFUNC(CheckFSFormat)
-  SYMFUNC(FontFileOpen)
-  SYMFUNC(FontFilePriorityRegisterRenderer)
-  SYMFUNC(FontFileRegisterRenderer)
-  SYMFUNC(FontParseXLFDName)
-  SYMFUNC(FontFileCloseFont)
-  SYMFUNC(FontFileOpenBitmap)
-  SYMFUNC(FontFileCompleteXLFD)
-  SYMFUNC(FontFileCountDashes)
-  SYMFUNC(FontFileFindNameInDir)
-  SYMFUNC(FontFileClose)
-  SYMFUNC(FontComputeInfoAccelerators)
-  SYMFUNC(FontDefaultFormat)
-  SYMFUNC(NameForAtom)
-  SYMFUNC(BitOrderInvert)
-  SYMFUNC(FontFileMatchRenderer)
-  SYMFUNC(RepadBitmap)
-  SYMFUNC(FontEncName)
-  SYMFUNC(FontEncRecode)
-  SYMFUNC(FontEncFind)
-  SYMFUNC(FontMapFind)
-  SYMFUNC(FontEncMapFind)
-  SYMFUNC(FontEncFromXLFD)
-  SYMFUNC(FontEncDirectory)
-  SYMFUNC(FontMapReverse)
-  SYMFUNC(FontMapReverseFree)
-  SYMFUNC(CreateFontRec)
-  SYMFUNC(DestroyFontRec)
-  SYMFUNC(GetGlyphs)
-  SYMFUNC(QueryGlyphExtents)
-  
-  SYMVAR(FontFileBitmapSources)
+    SYMFUNC(TwoByteSwap)
+    SYMFUNC(FourByteSwap)
+    SYMFUNC(FontCouldBeTerminal)
+    SYMFUNC(BufFileRead)
+    SYMFUNC(BufFileWrite)
+    SYMFUNC(CheckFSFormat)
+    SYMFUNC(FontFileOpen)
+    SYMFUNC(FontFilePriorityRegisterRenderer)
+    SYMFUNC(FontFileRegisterRenderer)
+    SYMFUNC(FontParseXLFDName)
+    SYMFUNC(FontFileCloseFont)
+    SYMFUNC(FontFileOpenBitmap)
+    SYMFUNC(FontFileCompleteXLFD)
+    SYMFUNC(FontFileCountDashes)
+    SYMFUNC(FontFileFindNameInDir)
+    SYMFUNC(FontFileClose)
+    SYMFUNC(FontComputeInfoAccelerators)
+    SYMFUNC(FontDefaultFormat)
+    SYMFUNC(NameForAtom)
+    SYMFUNC(BitOrderInvert)
+    SYMFUNC(FontFileMatchRenderer)
+    SYMFUNC(RepadBitmap)
+    SYMFUNC(FontEncName)
+    SYMFUNC(FontEncRecode)
+    SYMFUNC(FontEncFind)
+    SYMFUNC(FontMapFind)
+    SYMFUNC(FontEncMapFind)
+    SYMFUNC(FontEncFromXLFD)
+    SYMFUNC(FontEncDirectory)
+    SYMFUNC(FontMapReverse)
+    SYMFUNC(FontMapReverseFree)
+    SYMFUNC(CreateFontRec)
+    SYMFUNC(DestroyFontRec)
+    SYMFUNC(GetGlyphs)
+    SYMFUNC(QueryGlyphExtents)
+
+    SYMVAR(FontFileBitmapSources)
 
 #ifdef FONTENC_COMPATIBILITY
-  /* Obsolete backwards compatibility symbols -- fontencc.c */
-  SYMFUNC(font_encoding_from_xlfd)
-  SYMFUNC(font_encoding_find)
-  SYMFUNC(font_encoding_recode)
-  SYMFUNC(font_encoding_name)
-  SYMFUNC(identifyEncodingFile)
+    /* Obsolete backwards compatibility symbols -- fontencc.c */
+    SYMFUNC(font_encoding_from_xlfd)
+    SYMFUNC(font_encoding_find)
+    SYMFUNC(font_encoding_recode)
+    SYMFUNC(font_encoding_name)
+    SYMFUNC(identifyEncodingFile)
 #endif
 
-  /* fontcache.c */
-  SYMFUNC(FontCacheGetSettings)
-  SYMFUNC(FontCacheGetStatistics)
-  SYMFUNC(FontCacheChangeSettings)
-  SYMFUNC(FontCacheOpenCache)
-  SYMFUNC(FontCacheCloseCache)
-  SYMFUNC(FontCacheSearchEntry)
-  SYMFUNC(FontCacheGetEntry)
-  SYMFUNC(FontCacheInsertEntry)
-  SYMFUNC(FontCacheGetBitmap)
-
-  { 0, 0 },
+    /* fontcache.c */
+    SYMFUNC(FontCacheGetSettings)
+    SYMFUNC(FontCacheGetStatistics)
+    SYMFUNC(FontCacheChangeSettings)
+    SYMFUNC(FontCacheOpenCache)
+    SYMFUNC(FontCacheCloseCache)
+    SYMFUNC(FontCacheSearchEntry)
+    SYMFUNC(FontCacheGetEntry)
+    SYMFUNC(FontCacheInsertEntry)
+    SYMFUNC(FontCacheGetBitmap)
 
+    {0, 0}
 };