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>

diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig
index b5eac98fd7bdbd7f733d5fd998fee1cb53c6ecf1..e2ce79ef48c467d02f18c0c9fd4ad409c8ca0b5e 100644 (file)
--- 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 5d74647c446231a699b0358186c5941dd23bc539..8ae37c1b524995d49a8b0a0ba38362ebfd749f47 100644 (file)
--- 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 95ac5b41ad1cd2121c83ecc4392f666df767084e..634a8b717b02199ee310180ba35c9f8947a5e897 100644 (file)
--- 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 ce0d57ef39f60c49d7c723ab4607334e80d31d7f..979e6265ac5e823d355ca9171d8a8debe6195347 100644 (file)
--- 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 10b01c3eed663e716780784719909829bcc0a677..dd3f675911ee3716a9a835f5fd428db3d723cd8f 100644 (file)
--- 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 318473fbb26c6a447e661c6d7700fe7b9410ee0b..1112c84dd8bb7183d5fec826cea8c06e866d0ee8 100644 (file)
--- 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 615d8e128f1464a15ded745640ccce96bfa361c0..2de9158409c85ec468619e5f93289c5e133af66b 100644 (file)
--- 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 79880f30494fc1cf1d148c5c3b72fb742112878d..a863100828028f5f9d98a62f1dbacb1c62fa4ca0 100644 (file)
--- 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 1e688c59b2521f1815478002333d4b82796f67a6..babe2998d5ced2d0a1a8d237edb4fe5a2cd25604 100644 (file)
--- 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 f333d98941d6300997b61f5f01942ce688f7f07d..312364f010dcc7e5a8af3d95f9763c54f37f85d2 100644 (file)
--- 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 6315a857ab68cf0a64f3b71a718dcb288de48436..53ce0809cbd28eec842fab86b808c19b91c5dcc7 100644 (file)
--- 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 b83c07a57d25d046ef95ccc97813dc64853d3ddd..add6f7a0c6663c6ddf251bf749fc13812548d181 100644 (file)
--- 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 0cc2c6572826e00a2e87e3fb257b51094d36b77a..dffa96d5de00243d29940c68dd613666d7fad25c 100644 (file)
--- 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