From 8b8c0daa2c5388b629e506f8fac486392f81c826 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jun 2012 19:51:22 -0700
Subject: [PATCH] nls: fix (and rename) mac NLS table files and config options
The config options in the Kconfig file (with _CODEPAGE_ in the name)
didn't match the config option name in the Makefile (no _CODEPAGE_).
And both of them were of the hard-to-read MACXYZZY variety, which made
them hard to parse for normal humans: MACROMAN easily reads as "macro
man", not as "Mac Roman".
So rename the options to be consistent, and be NLS_MAC_xyzzy. Rename
the files to be mac-xyzzy.c too, and drop the "nls" part entirely (it's
already in the directory name).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
fs/nls/Kconfig | 22 ++++++++++----------
fs/nls/Makefile | 22 ++++++++++----------
fs/nls/{nls_macceltic.c => mac-celtic.c} | 2 +-
fs/nls/{nls_maccenteuro.c => mac-centeuro.c} | 2 +-
fs/nls/{nls_maccroatian.c => mac-croatian.c} | 2 +-
fs/nls/{nls_maccyrillic.c => mac-cyrillic.c} | 2 +-
fs/nls/{nls_macgaelic.c => mac-gaelic.c} | 2 +-
fs/nls/{nls_macgreek.c => mac-greek.c} | 2 +-
fs/nls/{nls_maciceland.c => mac-iceland.c} | 2 +-
fs/nls/{nls_macinuit.c => mac-inuit.c} | 2 +-
fs/nls/{nls_macroman.c => mac-roman.c} | 2 +-
fs/nls/{nls_macromanian.c => mac-romanian.c} | 2 +-
fs/nls/{nls_macturkish.c => mac-turkish.c} | 2 +-
13 files changed, 33 insertions(+), 33 deletions(-)
rename fs/nls/{nls_macceltic.c => mac-celtic.c} (99%)
rename fs/nls/{nls_maccenteuro.c => mac-centeuro.c} (99%)
rename fs/nls/{nls_maccroatian.c => mac-croatian.c} (99%)
rename fs/nls/{nls_maccyrillic.c => mac-cyrillic.c} (99%)
rename fs/nls/{nls_macgaelic.c => mac-gaelic.c} (99%)
rename fs/nls/{nls_macgreek.c => mac-greek.c} (99%)
rename fs/nls/{nls_maciceland.c => mac-iceland.c} (99%)
rename fs/nls/{nls_macinuit.c => mac-inuit.c} (99%)
rename fs/nls/{nls_macroman.c => mac-roman.c} (99%)
rename fs/nls/{nls_macromanian.c => mac-romanian.c} (99%)
rename fs/nls/{nls_macturkish.c => mac-turkish.c} (99%)
diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig
index b5eac98fd7bdb..e2ce79ef48c46 100644
--- a/fs/nls/Kconfig
+++ b/fs/nls/Kconfig
@@ -452,7 +452,7 @@ config NLS_KOI8_U
input/output character sets. Say Y here for the preferred Ukrainian
(koi8-u) and Belarusian (koi8-ru) character sets.
-config NLS_CODEPAGE_MACROMAN
+config NLS_MAC_ROMAN
tristate "Codepage macroman"
---help---
The Apple HFS file system family can deal with filenames in
@@ -467,7 +467,7 @@ config NLS_CODEPAGE_MACROMAN
If unsure, say Y.
-config NLS_CODEPAGE_MACCELTIC
+config NLS_MAC_CELTIC
tristate "Codepage macceltic"
---help---
The Apple HFS file system family can deal with filenames in
@@ -481,7 +481,7 @@ config NLS_CODEPAGE_MACCELTIC
If unsure, say Y.
-config NLS_CODEPAGE_MACCENTEURO
+config NLS_MAC_CENTEURO
tristate "Codepage maccenteuro"
---help---
The Apple HFS file system family can deal with filenames in
@@ -495,7 +495,7 @@ config NLS_CODEPAGE_MACCENTEURO
If unsure, say Y.
-config NLS_CODEPAGE_MACCROATIAN
+config NLS_MAC_CROATIAN
tristate "Codepage maccroatian"
---help---
The Apple HFS file system family can deal with filenames in
@@ -509,7 +509,7 @@ config NLS_CODEPAGE_MACCROATIAN
If unsure, say Y.
-config NLS_CODEPAGE_MACCYRILLIC
+config NLS_MAC_CYRILLIC
tristate "Codepage maccyrillic"
---help---
The Apple HFS file system family can deal with filenames in
@@ -523,7 +523,7 @@ config NLS_CODEPAGE_MACCYRILLIC
If unsure, say Y.
-config NLS_CODEPAGE_MACGAELIC
+config NLS_MAC_GAELIC
tristate "Codepage macgaelic"
---help---
The Apple HFS file system family can deal with filenames in
@@ -537,7 +537,7 @@ config NLS_CODEPAGE_MACGAELIC
If unsure, say Y.
-config NLS_CODEPAGE_MACGREEK
+config NLS_MAC_GREEK
tristate "Codepage macgreek"
---help---
The Apple HFS file system family can deal with filenames in
@@ -551,7 +551,7 @@ config NLS_CODEPAGE_MACGREEK
If unsure, say Y.
-config NLS_CODEPAGE_MACICELAND
+config NLS_MAC_ICELAND
tristate "Codepage maciceland"
---help---
The Apple HFS file system family can deal with filenames in
@@ -565,7 +565,7 @@ config NLS_CODEPAGE_MACICELAND
If unsure, say Y.
-config NLS_CODEPAGE_MACINUIT
+config NLS_MAC_INUIT
tristate "Codepage macinuit"
---help---
The Apple HFS file system family can deal with filenames in
@@ -579,7 +579,7 @@ config NLS_CODEPAGE_MACINUIT
If unsure, say Y.
-config NLS_CODEPAGE_MACROMANIAN
+config NLS_MAC_ROMANIAN
tristate "Codepage macromanian"
---help---
The Apple HFS file system family can deal with filenames in
@@ -593,7 +593,7 @@ config NLS_CODEPAGE_MACROMANIAN
If unsure, say Y.
-config NLS_CODEPAGE_MACTURKISH
+config NLS_MAC_TURKISH
tristate "Codepage macturkish"
---help---
The Apple HFS file system family can deal with filenames in
diff --git a/fs/nls/Makefile b/fs/nls/Makefile
index 5d74647c44623..8ae37c1b52499 100644
--- a/fs/nls/Makefile
+++ b/fs/nls/Makefile
@@ -42,14 +42,14 @@ obj-$(CONFIG_NLS_ISO8859_15) += nls_iso8859-15.o
obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o
obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o
obj-$(CONFIG_NLS_UTF8) += nls_utf8.o
-obj-$(CONFIG_NLS_MACCELTIC) += nls_macceltic.o
-obj-$(CONFIG_NLS_MACCENTEURO) += nls_maccenteuro.o
-obj-$(CONFIG_NLS_MACCROATIAN) += nls_maccroatian.o
-obj-$(CONFIG_NLS_MACCYRILLIC) += nls_maccyrillic.o
-obj-$(CONFIG_NLS_MACGAELIC) += nls_macgaelic.o
-obj-$(CONFIG_NLS_MACGREEK) += nls_macgreek.o
-obj-$(CONFIG_NLS_MACICELAND) += nls_maciceland.o
-obj-$(CONFIG_NLS_MACINUIT) += nls_macinuit.o
-obj-$(CONFIG_NLS_MACROMANIAN) += nls_macromanian.o
-obj-$(CONFIG_NLS_MACROMAN) += nls_macroman.o
-obj-$(CONFIG_NLS_MACTURKISH) += nls_macturkish.o
+obj-$(CONFIG_NLS_MAC_CELTIC) += mac-celtic.o
+obj-$(CONFIG_NLS_MAC_CENTEURO) += mac-centeuro.o
+obj-$(CONFIG_NLS_MAC_CROATIAN) += mac-croatian.o
+obj-$(CONFIG_NLS_MAC_CYRILLIC) += mac-cyrillic.o
+obj-$(CONFIG_NLS_MAC_GAELIC) += mac-gaelic.o
+obj-$(CONFIG_NLS_MAC_GREEK) += mac-greek.o
+obj-$(CONFIG_NLS_MAC_ICELAND) += mac-iceland.o
+obj-$(CONFIG_NLS_MAC_INUIT) += mac-inuit.o
+obj-$(CONFIG_NLS_MAC_ROMANIAN) += mac-romanian.o
+obj-$(CONFIG_NLS_MAC_ROMAN) += mac-roman.o
+obj-$(CONFIG_NLS_MAC_TURKISH) += mac-turkish.o
diff --git a/fs/nls/nls_macceltic.c b/fs/nls/mac-celtic.c
similarity index 99%
rename from fs/nls/nls_macceltic.c
rename to fs/nls/mac-celtic.c
index 95ac5b41ad1cd..634a8b717b021 100644
--- a/fs/nls/nls_macceltic.c
+++ b/fs/nls/mac-celtic.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macceltic.c
+ * linux/fs/nls/mac-celtic.c
*
* Charset macceltic translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_maccenteuro.c b/fs/nls/mac-centeuro.c
similarity index 99%
rename from fs/nls/nls_maccenteuro.c
rename to fs/nls/mac-centeuro.c
index ce0d57ef39f60..979e6265ac5e8 100644
--- a/fs/nls/nls_maccenteuro.c
+++ b/fs/nls/mac-centeuro.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_maccenteuro.c
+ * linux/fs/nls/mac-centeuro.c
*
* Charset maccenteuro translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_maccroatian.c b/fs/nls/mac-croatian.c
similarity index 99%
rename from fs/nls/nls_maccroatian.c
rename to fs/nls/mac-croatian.c
index 10b01c3eed663..dd3f675911ee3 100644
--- a/fs/nls/nls_maccroatian.c
+++ b/fs/nls/mac-croatian.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_maccroatian.c
+ * linux/fs/nls/mac-croatian.c
*
* Charset maccroatian translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_maccyrillic.c b/fs/nls/mac-cyrillic.c
similarity index 99%
rename from fs/nls/nls_maccyrillic.c
rename to fs/nls/mac-cyrillic.c
index 318473fbb26c6..1112c84dd8bb7 100644
--- a/fs/nls/nls_maccyrillic.c
+++ b/fs/nls/mac-cyrillic.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_maccyrillic.c
+ * linux/fs/nls/mac-cyrillic.c
*
* Charset maccyrillic translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macgaelic.c b/fs/nls/mac-gaelic.c
similarity index 99%
rename from fs/nls/nls_macgaelic.c
rename to fs/nls/mac-gaelic.c
index 615d8e128f146..2de9158409c85 100644
--- a/fs/nls/nls_macgaelic.c
+++ b/fs/nls/mac-gaelic.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macgaelic.c
+ * linux/fs/nls/mac-gaelic.c
*
* Charset macgaelic translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macgreek.c b/fs/nls/mac-greek.c
similarity index 99%
rename from fs/nls/nls_macgreek.c
rename to fs/nls/mac-greek.c
index 79880f30494fc..a863100828028 100644
--- a/fs/nls/nls_macgreek.c
+++ b/fs/nls/mac-greek.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macgreek.c
+ * linux/fs/nls/mac-greek.c
*
* Charset macgreek translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_maciceland.c b/fs/nls/mac-iceland.c
similarity index 99%
rename from fs/nls/nls_maciceland.c
rename to fs/nls/mac-iceland.c
index 1e688c59b2521..babe2998d5ced 100644
--- a/fs/nls/nls_maciceland.c
+++ b/fs/nls/mac-iceland.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_maciceland.c
+ * linux/fs/nls/mac-iceland.c
*
* Charset maciceland translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macinuit.c b/fs/nls/mac-inuit.c
similarity index 99%
rename from fs/nls/nls_macinuit.c
rename to fs/nls/mac-inuit.c
index f333d98941d63..312364f010dcc 100644
--- a/fs/nls/nls_macinuit.c
+++ b/fs/nls/mac-inuit.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macinuit.c
+ * linux/fs/nls/mac-inuit.c
*
* Charset macinuit translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macroman.c b/fs/nls/mac-roman.c
similarity index 99%
rename from fs/nls/nls_macroman.c
rename to fs/nls/mac-roman.c
index 6315a857ab68c..53ce0809cbd28 100644
--- a/fs/nls/nls_macroman.c
+++ b/fs/nls/mac-roman.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macroman.c
+ * linux/fs/nls/mac-roman.c
*
* Charset macroman translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macromanian.c b/fs/nls/mac-romanian.c
similarity index 99%
rename from fs/nls/nls_macromanian.c
rename to fs/nls/mac-romanian.c
index b83c07a57d25d..add6f7a0c6663 100644
--- a/fs/nls/nls_macromanian.c
+++ b/fs/nls/mac-romanian.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macromanian.c
+ * linux/fs/nls/mac-romanian.c
*
* Charset macromanian translation tables.
* Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_macturkish.c b/fs/nls/mac-turkish.c
similarity index 99%
rename from fs/nls/nls_macturkish.c
rename to fs/nls/mac-turkish.c
index 0cc2c6572826e..dffa96d5de002 100644
--- a/fs/nls/nls_macturkish.c
+++ b/fs/nls/mac-turkish.c
@@ -1,5 +1,5 @@
/*
- * linux/fs/nls/nls_macturkish.c
+ * linux/fs/nls/mac-turkish.c
*
* Charset macturkish translation tables.
* Generated automatically from the Unicode and charset