[PATCH xserver] Fix UTF-8 encoding
Matěj Cepl
mcepl at redhat.com
Fri Jun 17 06:24:45 PDT 2011
Report to find out all non-UTF-8 files created by
cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do
if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then
/bin/true
else
echo $FILE
fi
done >>report
Signed-off-by: Matěj Cepl <mcepl at redhat.com>
---
exa/exa.c | 4 ++--
exa/exa_accel.c | 6 +++---
exa/exa_classic.c | 2 +-
exa/exa_driver.c | 2 +-
exa/exa_migration_classic.c | 4 ++--
exa/exa_migration_mixed.c | 2 +-
exa/exa_mixed.c | 2 +-
exa/exa_unaccel.c | 2 +-
hw/kdrive/ephyr/ephyr.c | 2 +-
hw/kdrive/ephyr/ephyr.h | 2 +-
hw/kdrive/ephyr/ephyr_draw.c | 2 +-
hw/kdrive/ephyr/ephyrinit.c | 2 +-
hw/kdrive/ephyr/hostx.c | 2 +-
hw/kdrive/ephyr/hostx.h | 2 +-
hw/kdrive/ephyr/os.c | 2 +-
hw/kdrive/fake/kbd.c | 2 +-
hw/kdrive/fbdev/fbdev.c | 2 +-
hw/kdrive/fbdev/fbdev.h | 2 +-
hw/kdrive/fbdev/fbinit.c | 2 +-
hw/kdrive/linux/keyboard.c | 8 ++++----
hw/kdrive/linux/linux.c | 2 +-
hw/kdrive/linux/mouse.c | 2 +-
hw/kdrive/linux/ps2.c | 2 +-
hw/kdrive/linux/tslib.c | 10 +++++-----
hw/kdrive/src/kcmap.c | 2 +-
hw/kdrive/src/kdrive.h | 2 +-
hw/kdrive/src/kinfo.c | 2 +-
hw/kdrive/src/kinput.c | 4 ++--
hw/kdrive/src/kshadow.c | 2 +-
hw/xfree86/exa/examodule.c | 2 +-
hw/xfree86/modes/xf86Modes.h | 2 +-
hw/xfree86/modes/xf86cvt.c | 4 ++--
hw/xfree86/os-support/solaris/sun_agp.c | 4 ++--
miext/shadow/shadow.c | 2 +-
34 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/exa/exa.c b/exa/exa.c
index a4e294a..4ce983b 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -1,7 +1,7 @@
/*
- * Copyright © 2001 Keith Packard
+ * Copyright © 2001 Keith Packard
*
- * Partly based on code that is Copyright © The XFree86 Project Inc.
+ * Partly based on code that is Copyright © The XFree86 Project Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index b4c0f83..5600539 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1,7 +1,7 @@
/*
- * Copyright © 2001 Keith Packard
+ * Copyright © 2001 Keith Packard
*
- * Partly based on code that is Copyright © The XFree86 Project Inc.
+ * Partly based on code that is Copyright © The XFree86 Project Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -23,7 +23,7 @@
*
* Authors:
* Eric Anholt <eric at anholt.net>
- * Michel Dänzer <michel at tungstengraphics.com>
+ * Michel Dänzer <michel at tungstengraphics.com>
*
*/
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index 169ce3a..919b29d 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2009 Maarten Maathuis
+ * Copyright © 2009 Maarten Maathuis
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index b9903d1..795cb00 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2009 Maarten Maathuis
+ * Copyright © 2009 Maarten Maathuis
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c
index 6c49fb7..dd3cd49 100644
--- a/exa/exa_migration_classic.c
+++ b/exa/exa_migration_classic.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Intel Corporation
+ * Copyright © 2006 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
*
* Authors:
* Eric Anholt <eric at anholt.net>
- * Michel Dänzer <michel at tungstengraphics.com>
+ * Michel Dänzer <michel at tungstengraphics.com>
*
*/
diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index fb47151..4b22619 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2009 Maarten Maathuis
+ * Copyright © 2009 Maarten Maathuis
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index fd1afb2..58645ae 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2009 Maarten Maathuis
+ * Copyright © 2009 Maarten Maathuis
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 078b91c..71dff65 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -1,6 +1,6 @@
/*
*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index ac8e5be..7ebf1c2 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at openedhand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h
index 41a82bf..2384800 100644
--- a/hw/kdrive/ephyr/ephyr.h
+++ b/hw/kdrive/ephyr/ephyr.h
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at o-hand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index b1982a5..cf5f553 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Intel Corporation
+ * Copyright © 2006 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 2deb7b8..7d4cadb 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at o-hand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 2ebeca9..4caf451 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at o-hand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h
index e65e0c9..4257857 100644
--- a/hw/kdrive/ephyr/hostx.h
+++ b/hw/kdrive/ephyr/hostx.h
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at o-hand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c
index 4bf6e88..e4dc678 100644
--- a/hw/kdrive/ephyr/os.c
+++ b/hw/kdrive/ephyr/os.c
@@ -2,7 +2,7 @@
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum at o-hand.com>
*
- * Copyright © 2004 Nokia
+ * Copyright © 2004 Nokia
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c
index 51fba04..769730d 100644
--- a/hw/kdrive/fake/kbd.c
+++ b/hw/kdrive/fake/kbd.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index 2c7fa91..661e5b4 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h
index ebac6ad..ec53784 100644
--- a/hw/kdrive/fbdev/fbdev.h
+++ b/hw/kdrive/fbdev/fbdev.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 51e7e00..3b55ab1 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c
index e05c5ab..f5f9d9b 100644
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@@ -1,10 +1,10 @@
/*
- * Copyright © 1999 Keith Packard
- * XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf at o-hand.com>
+ * Copyright © 1999 Keith Packard
+ * XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf at o-hand.com>
*
* LinuxKeyboardRead() XKB code based on xf86KbdLnx.c:
- * Copyright © 1990,91 by Thomas Roell, Dinkelscherben, Germany.
- * Copyright © 1994-2001 by The XFree86 Project, Inc.
+ * Copyright © 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ * Copyright © 1994-2001 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"),
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 9863c14..a53db49 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 1db5348..93c2078 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2001 Keith Packard
+ * Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index 552a3c7..465b963 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 570cbf9..1f30cca 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -4,11 +4,11 @@
* Derived from ts.c by Keith Packard
* Derived from ps2.c by Jim Gettys
*
- * Copyright © 1999 Keith Packard
- * Copyright © 2000 Compaq Computer Corporation
- * Copyright © 2002 MontaVista Software Inc.
- * Copyright © 2005 OpenedHand Ltd.
- * Copyright © 2006 Nokia Corporation
+ * Copyright © 1999 Keith Packard
+ * Copyright © 2000 Compaq Computer Corporation
+ * Copyright © 2002 MontaVista Software Inc.
+ * Copyright © 2005 OpenedHand Ltd.
+ * Copyright © 2006 Nokia Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index 9bfdd78..6e0fc14 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 2ab535a..847d89b 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 8193215..7055fbf 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index cdf55d7..c863950 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1,6 +1,6 @@
/*
- * Copyright © 1999 Keith Packard
- * Copyright © 2006 Nokia Corporation
+ * Copyright © 1999 Keith Packard
+ * Copyright © 2006 Nokia Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 6f5a2f3..63bb87b 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 83f72b5..1556051 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Intel Corporation
+ * Copyright © 2006 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/modes/xf86Modes.h b/hw/xfree86/modes/xf86Modes.h
index 38927b1..c72a935 100644
--- a/hw/xfree86/modes/xf86Modes.h
+++ b/hw/xfree86/modes/xf86Modes.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Intel Corporation
+ * Copyright © 2006 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c
index 244f3b9..d5feccc 100644
--- a/hw/xfree86/modes/xf86cvt.c
+++ b/hw/xfree86/modes/xf86cvt.c
@@ -152,7 +152,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
if (!Reduced) { /* simplified GTF calculation */
- /* 4) Minimum time of vertical sync + back porch interval (µs)
+ /* 4) Minimum time of vertical sync + back porch interval (µs)
* default 550.0 */
#define CVT_MIN_VSYNC_BP 550.0
@@ -223,7 +223,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
Mode->VSyncEnd = Mode->VSyncStart + VSync;
} else { /* Reduced blanking */
- /* Minimum vertical blanking interval time (µs) - default 460 */
+ /* Minimum vertical blanking interval time (µs) - default 460 */
#define CVT_RB_MIN_VBLANK 460.0
/* Fixed number of clocks for horizontal sync */
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index a4517d6..0331ac1 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -3,8 +3,8 @@
*
* This version is for Solaris.
*
- * Copyright © 2000 VA Linux Systems, Inc.
- * Copyright © 2001 The XFree86 Project, Inc.
+ * Copyright © 2000 VA Linux Systems, Inc.
+ * Copyright © 2001 The XFree86 Project, Inc.
*/
/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
*
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index cb1b299..95f11cd 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2000 Keith Packard
+ * Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
--
1.7.5.4
More information about the xorg-devel
mailing list