[xine-cvs] CVS: xine-ui/src/xitk lang.c, 1.22, 1.23 lang.h, 1.11, 1.12

[<dg...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30478/src/xitk

Modified Files:
	lang.c lang.h 
Log Message:
Make langs_t use character arrays, so that _langs can be totally constant.

Index: lang.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/lang.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lang.c	14 Jan 2008 19:43:27 -0000	1.22
+++ lang.c	14 Jan 2008 19:46:16 -0000	1.23
@@ -236,8 +236,8 @@
 /* Global definition */
 static const langs_t _langs[] = {
   /* English section */
-  { "C",                ENGLISH,            "en",    NULL         }, /* WARNING: This should be the first entry */
-  { "POSIX",            ENGLISH,            "en",    NULL         },
+  { "C",                ENGLISH,            "en",    ""           }, /* WARNING: This should be the first entry */
+  { "POSIX",            ENGLISH,            "en",    ""           },
   { "en_GB",            ENGLISH,            "en",    "ISO-8859-1" },
 
   /* French section */
@@ -276,7 +276,7 @@
   { "nb_NO.ISO-8859-1", NORWEGIAN_BOKMAL,   "nb",    "ISO-8859-1" },
 
   /* The ultimate solution */
-  { NULL,               ENGLISH,            "en",    "ISO-8859-1" }
+  { "",                 ENGLISH,            "en",    "ISO-8859-1" }
 };
   
 /* ISO 639-1 */

Index: lang.h
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/lang.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lang.h	13 Nov 2007 21:12:18 -0000	1.11
+++ lang.h	14 Jan 2008 19:46:16 -0000	1.12
@@ -39,10 +39,10 @@
 } lang_code_t;
 
 typedef struct {
-  char         *lang;
-  lang_code_t   code;
-  char         *ext;
-  char         *doc_encoding;
+  char         lang[20];
+  lang_code_t  code;
+  char         ext[8];
+  char         doc_encoding[16];
 } langs_t;
 
 const langs_t *get_lang(void);