X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fsetnames.c;h=3f4cdda67bf6274bed957275ae380535be58700a;hb=9adf0cac23ff0639f64a9d510c71e5aab44c27e9;hp=e9665971f9422614c2b5707bb727c866c18f06ba;hpb=1571781022499a9d0c32d249f89945d034d1cbff;p=libucw.git

diff --git a/charset/setnames.c b/charset/setnames.c
index e9665971..3f4cdda6 100644
--- a/charset/setnames.c
+++ b/charset/setnames.c
@@ -1,33 +1,54 @@
 /*
  *	Character Set Conversion Library 1.0 -- Character Set Names
  *
- *	(c) 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *	(c) 1998--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "charset/charconv.h"
+#include <ucw/lib.h>
+#include <charset/charconv.h>
 
 #include <string.h>
 
-char *cs_names[] = {
+/* Names according to RFC 1345 (see http://www.iana.org/assignments/character-sets) */
+
+static const char *cs_names[] = {
 	"US-ASCII",
 	"ISO-8859-1",
 	"ISO-8859-2",
+	"ISO-8859-3",
+	"ISO-8859-4",
+	"ISO-8859-5",
+	"ISO-8859-6",
+	"ISO-8859-7",
+	"ISO-8859-8",
+	"ISO-8859-9",
+	"ISO-8859-10",
+	"ISO-8859-11",
+	"ISO-8859-13",
+	"ISO-8859-14",
+	"ISO-8859-15",
+	"ISO-8859-16",
 	"windows-1250",
+	"windows-1251",
+	"windows-1252",
 	"x-kam-cs",
 	"CSN_369103",
 	"cp852",
 	"x-mac-ce",
-	"utf-8"
+	"x-cork",
+	"utf-8",
+	"utf-16be",
+	"utf-16le"
 };
 
 int
-find_charset_by_name(char *c)
+find_charset_by_name(const char *c)
 {
-	unsigned int i;
+	uint i;
 
 	for(i=0; i<CONV_NUM_CHARSETS; i++)
 		if (!strcasecmp(cs_names[i], c))
@@ -41,5 +62,5 @@ charset_name(int i)
   if (i < 0 || i > CONV_NUM_CHARSETS)
     return "x-unknown";
   else
-    return cs_names[i];
+    return (char *)cs_names[i];
 }