fixed last commit

[NeonServV5.git] / lang.c

diff --git a/lang.c b/lang.c
index f2880bc2f300da7cb33342e7f5d330ecc4b1e925..4c9f877b252ec960ace9aeb8fb247ba050c8cc62 100644 (file)
--- a/lang.c
+++ b/lang.c
@@ -16,13 +16,13 @@ void free_lang() {
 }
 
 static struct language* add_language(char *langtag, char *langname) {
-    int index;
-    for(index = 0; index < MAXLANGUAGES; index++) {
-        if(langdict[index] == NULL) break;
-        if(!strcmp(langdict[index]->langname, langname) || !strcmp(langdict[index]->langtag, langtag))
-            return langdict[index];
+    int cindex;
+    for(cindex = 0; cindex < MAXLANGUAGES; cindex++) {
+        if(langdict[cindex] == NULL) break;
+        if(!strcmp(langdict[cindex]->langname, langname) || !strcmp(langdict[cindex]->langtag, langtag))
+            return langdict[cindex];
     }
-    if(index == MAXLANGUAGES) return NULL;
+    if(cindex == MAXLANGUAGES) return NULL;
     struct language *lang = malloc(sizeof(*lang));
     if (!lang) {
         perror("malloc() failed");
@@ -42,21 +42,21 @@ static int get_entry_index(const char *ident) {
 }
 
 struct language* get_language_by_tag(char *tag) {
-    int index;
-    for(index = 0; index < MAXLANGUAGES; index++) {
-        if(langdict[index] == NULL) break;
-        if(!strcmp(langdict[index]->langtag, tag))
-            return langdict[index];
+    int cindex;
+    for(cindex = 0; cindex < MAXLANGUAGES; cindex++) {
+        if(langdict[cindex] == NULL) break;
+        if(!strcmp(langdict[cindex]->langtag, tag))
+            return langdict[cindex];
     }
     return NULL;
 }
 
 struct language* get_language_by_name(char *name) {
-    int index;
-    for(index = 0; index < MAXLANGUAGES; index++) {
-        if(langdict[index] == NULL) break;
-        if(!strcmp(langdict[index]->langname, name))
-            return langdict[index];
+    int cindex;
+    for(cindex = 0; cindex < MAXLANGUAGES; cindex++) {
+        if(langdict[cindex] == NULL) break;
+        if(!strcmp(langdict[cindex]->langname, name))
+            return langdict[cindex];
     }
     return NULL;
 }
@@ -71,9 +71,9 @@ void register_default_language_table(const struct default_language_entry *msgtab
     if(lang_c == NULL) 
         lang_c = add_language(DEFAULT_LANG_TAG, DEFAULT_LANG_NAME);
     struct language_table *lang_entry;
-    int index;
+    int cindex;
     while(msgtab->ident) {
-        index = get_entry_index(msgtab->ident);
+        cindex = get_entry_index(msgtab->ident);
         lang_entry = malloc(sizeof(*lang_entry));
         if (!lang_entry) {
             perror("malloc() failed");
@@ -81,13 +81,13 @@ void register_default_language_table(const struct default_language_entry *msgtab
         }
         lang_entry->ident = strdup(msgtab->ident);
         lang_entry->text = strdup(msgtab->text);
-        lang_entry->next = lang_c->entrys[index];
-        lang_c->entrys[index] = lang_entry;
+        lang_entry->next = lang_c->entrys[cindex];
+        lang_c->entrys[cindex] = lang_entry;
         msgtab++;
     }
 }
 
-char *get_language_string(struct UserNode *user, char* msg_ident) {
+char *get_language_string(struct UserNode *user, const char* msg_ident) {
     struct language* lang;
     if((user->flags & USERFLAG_ISAUTHED)) {
         if(!(user->flags & USERFLAG_LOADED_SETTINGS))
@@ -95,10 +95,11 @@ char *get_language_string(struct UserNode *user, char* msg_ident) {
         lang = user->language;
     } else
         lang = lang_c;
-    int index = get_entry_index(msg_ident);
+    int cindex = get_entry_index(msg_ident);
     struct language_table* entry;
-    for(entry = lang->entrys[index]; entry; entry = entry->next) {
+    for(entry = lang->entrys[cindex]; entry; entry = entry->next) {
         if(!strcmp(entry->ident, msg_ident))
             return entry->text;
     }
+    return NULL;
 }