Rename charsets from mac* to mac-*

PATCH New Vladimir 'φ-coder/phcoder' Serbinenko 1 participant 1 message Jun 2, 2012 VFS

lore

Share & tools

lore

Vladimir 'φ-coder/phcoder' Serbinenko

author

2012-06-02 01:08 UTC #0 lore raw

PATCH 4/5 Rename charsets from mac* to mac-*

Signed-off-by Vladimir Serbinenko <[email protected]>

---
 fs/nls/Kconfig            |   24 ++++++++++++------------
 fs/nls/nls_mac-celtic.c   |    2 +-
 fs/nls/nls_mac-centeuro.c |    2 +-
 fs/nls/nls_mac-croatian.c |    2 +-
 fs/nls/nls_mac-cyrillic.c |    2 +-
 fs/nls/nls_mac-gaelic.c   |    2 +-
 fs/nls/nls_mac-greek.c    |    2 +-
 fs/nls/nls_mac-iceland.c  |    2 +-
 fs/nls/nls_mac-inuit.c    |    2 +-
 fs/nls/nls_mac-roman.c    |    2 +-
 fs/nls/nls_mac-romanian.c |    2 +-
 fs/nls/nls_mac-turkish.c  |    2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

fs/nls/Kconfig +12 ~~-12~~

index e2ce79e..3a5747e 100644
@@ -30,7 +30,7 @@ config NLS_DEFAULT
 	  cp949, cp950, cp1251, cp1255, euc-jp, euc-kr, gb2312, iso8859-1,
 	  iso8859-2, iso8859-3, iso8859-4, iso8859-5, iso8859-6, iso8859-7,
 	  iso8859-8, iso8859-9, iso8859-13, iso8859-14, iso8859-15,
-	  koi8-r, koi8-ru, koi8-u, sjis, tis-620, macroman, utf8.
+	  koi8-r, koi8-ru, koi8-u, sjis, tis-620, mac-roman, utf8.
 	  If you specify a wrong value, it will use the built-in NLS;
 	  compatible with iso8859-1.

@@ -453,7 +453,7 @@ config NLS_KOI8_U
 	  (koi8-u) and Belarusian (koi8-ru) character sets.
 
 config NLS_MAC_ROMAN
-	tristate "Codepage macroman"
+	tristate "Codepage mac-roman"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -468,7 +468,7 @@ config NLS_MAC_ROMAN
 	  If unsure, say Y.
 
 config NLS_MAC_CELTIC
-	tristate "Codepage macceltic"
+	tristate "Codepage mac-celtic"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -482,7 +482,7 @@ config NLS_MAC_CELTIC
 	  If unsure, say Y.
 
 config NLS_MAC_CENTEURO
-	tristate "Codepage maccenteuro"
+	tristate "Codepage mac-centeuro"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -496,7 +496,7 @@ config NLS_MAC_CENTEURO
 	  If unsure, say Y.
 
 config NLS_MAC_CROATIAN
-	tristate "Codepage maccroatian"
+	tristate "Codepage mac-croatian"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -510,7 +510,7 @@ config NLS_MAC_CROATIAN
 	  If unsure, say Y.
 
 config NLS_MAC_CYRILLIC
-	tristate "Codepage maccyrillic"
+	tristate "Codepage mac-cyrillic"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -524,7 +524,7 @@ config NLS_MAC_CYRILLIC
 	  If unsure, say Y.
 
 config NLS_MAC_GAELIC
-	tristate "Codepage macgaelic"
+	tristate "Codepage mac-gaelic"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -538,7 +538,7 @@ config NLS_MAC_GAELIC
 	  If unsure, say Y.
 
 config NLS_MAC_GREEK
-	tristate "Codepage macgreek"
+	tristate "Codepage mac-greek"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -552,7 +552,7 @@ config NLS_MAC_GREEK
 	  If unsure, say Y.
 
 config NLS_MAC_ICELAND
-	tristate "Codepage maciceland"
+	tristate "Codepage mac-iceland"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -566,7 +566,7 @@ config NLS_MAC_ICELAND
 	  If unsure, say Y.
 
 config NLS_MAC_INUIT
-	tristate "Codepage macinuit"
+	tristate "Codepage mac-inuit"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -580,7 +580,7 @@ config NLS_MAC_INUIT
 	  If unsure, say Y.
 
 config NLS_MAC_ROMANIAN
-	tristate "Codepage macromanian"
+	tristate "Codepage mac-romanian"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

@@ -594,7 +594,7 @@ config NLS_MAC_ROMANIAN
 	  If unsure, say Y.
 
 config NLS_MAC_TURKISH
-	tristate "Codepage macturkish"
+	tristate "Codepage mac-turkish"
 	---help---
 	  The Apple HFS file system family can deal with filenames in
 	  native language character sets. These character sets are stored in

fs/nls/nls_mac-celtic.c +1 -1

index 95ac5b4..984ecb5 100644
@@ -578,7 +578,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macceltic",
+	.charset	= "mac-celtic",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-centeuro.c +1 -1

index ce0d57e..246d279 100644
@@ -508,7 +508,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "maccenteuro",
+	.charset	= "mac-centeuro",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-croatian.c +1 -1

index 10b01c3..da965de 100644
@@ -578,7 +578,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "maccroatian",
+	.charset	= "mac-croatian",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-cyrillic.c +1 -1

index 318473f..35e1a7ea 100644
@@ -473,7 +473,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "maccyrillic",
+	.charset	= "mac-cyrillic",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-gaelic.c +1 -1

index 615d8e1..7815e00 100644
@@ -543,7 +543,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macgaelic",
+	.charset	= "mac-gaelic",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-greek.c +1 -1

index 79880f3..b5ede78 100644
@@ -473,7 +473,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macgreek",
+	.charset	= "mac-greek",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-iceland.c +1 -1

index 1e688c5..d0c7e71 100644
@@ -578,7 +578,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "maciceland",
+	.charset	= "mac-iceland",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-inuit.c +1 -1

index f333d98..85fc451 100644
@@ -508,7 +508,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macinuit",
+	.charset	= "mac-inuit",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-roman.c +1 -1

index 6315a85..711e152 100644
@@ -613,7 +613,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macroman",
+	.charset	= "mac-roman",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-romanian.c +1 -1

index b83c07a..53ac67e 100644
@@ -578,7 +578,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macromanian",
+	.charset	= "mac-romanian",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

fs/nls/nls_mac-turkish.c +1 -1

index 0cc2c65..842bf3d 100644
@@ -578,7 +578,7 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
 }
 
 static struct nls_table table = {
-	.charset	= "macturkish",
+	.charset	= "mac-turkish",
 	.uni2char	= uni2char,
 	.char2uni	= char2uni,
 	.charset2lower	= charset2lower,

Signature · 5 lines

1.7.7.6

-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko