Merge remote-tracking branch 'origin/released'

3 files changed, 13 insertions, 13 deletions

diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am
index e276fec13..7147f5a42 100644
--- a/mkfontscale/Makefile.am
+++ b/mkfontscale/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
@@ -10,7 +10,7 @@
 #  without 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/mkfontscale/configure.ac b/mkfontscale/configure.ac
index f001e0937..6f7698c74 100644
--- a/mkfontscale/configure.ac
+++ b/mkfontscale/configure.ac
@@ -1,5 +1,5 @@
 dnl  Copyright 2005 Red Hat, Inc.
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software
 dnl  and its documentation for any purpose is hereby granted without fee,
 dnl  provided that the above copyright notice appear in all copies and
@@ -9,7 +9,7 @@ dnl  advertising or publicity pertaining to distribution of the software
 dnl  without specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any
 dnl  purpose.  It 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
 dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -38,11 +38,11 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-AC_CHECK_LIB(z, gzopen, [], 
+AC_CHECK_LIB(z, gzopen, [],
 	[AC_MSG_ERROR([zlib is required, but was not found.])])
 
-AC_ARG_WITH(bzip2, 
-	AS_HELP_STRING([--with-bzip2], 
+AC_ARG_WITH(bzip2,
+	AS_HELP_STRING([--with-bzip2],
 			[Support bzip2 compressed bitmap fonts]),
 	[], [with_bzip2=no])
 if test "x$with_bzip2" = xyes; then
diff --git a/mkfontscale/ident.c b/mkfontscale/ident.c
index 15fb76be2..bf544832c 100644
--- a/mkfontscale/ident.c
+++ b/mkfontscale/ident.c
@@ -142,8 +142,8 @@ fontFileSeek(fontFile *ff, z_off_t offset, int whence)
 	    break;
 	  default:
 	    return -1;
-	} 
-	
+	}
+
 	while (n > BUFSIZ) {
 	    if (BZ2_bzread(ff->f.bz2, buf, BUFSIZ) != BUFSIZ)
 		return -1;
@@ -221,7 +221,7 @@ getInt32(fontFile *f, int format)
     }
 }
 
-int 
+int
 bitmapIdentify(const char *filename, char **name)
 {
     fontFile ff;
@@ -270,7 +270,7 @@ pcfIdentify(fontFile *f, char **name)
     rc = fontFileSeek(f, prop_position, SEEK_SET);
     if(rc < 0)
         goto fail;
-    
+
     format = getLSB32(f);
     if((format & 0xFFFFFF00) != 0)
         goto fail;
@@ -428,7 +428,7 @@ bdfIdentify(fontFile *f, char **name)
     while(1) {
         if(!eol) {
             rc = bdfskip(f);
-            if(rc < 0) 
+            if(rc < 0)
                 goto fail;
         }
         k = getKeyword(f, &eol);