From: Art Cancro <ajc@uncensored.citadel.org>
Date: Mon, 23 May 2011 19:34:11 +0000 (-0400)
Subject: ServerShutdownModule_GETTEXT() was failing on non-locale-aware systems, fixed
X-Git-Tag: v7.87~17^2~2^2~2
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=84de2c966be6df8599c8d8d13c6e971f550cb2a0

ServerShutdownModule_GETTEXT() was failing on non-locale-aware systems, fixed
---

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 382053a77..43b8db26e 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -41,7 +41,7 @@ const char *AvailLang[] = {
 	""
 };
 
-const char **AvailLangLoaded;
+const char **AvailLangLoaded = NULL;
 long nLocalesLoaded = 0;
 
 #ifdef HAVE_USELOCALE
@@ -379,22 +379,6 @@ void initialize_locales(void) {
 #endif
 }
 
-
-void 
-ServerShutdownModule_GETTEXT
-(void)
-{
-#ifdef HAVE_USELOCALE
-	int i;
-	for (i = 0; i < nLocalesLoaded; ++i) {
-		if (Empty_Locale != wc_locales[i])
-			freelocale(wc_locales[i]);
-	}
-	free(wc_locales);
-#endif
-	free(AvailLangLoaded);
-}
-
 #else	/* ENABLE_NLS */
 const char *AvailLang[] = {
 	"C", ""};
@@ -493,4 +477,20 @@ SessionDestroyModule_GETTEXT
 #ifdef ENABLE_NLS
 	stop_selected_language();				/* unset locale */
 #endif
+
+void 
+ServerShutdownModule_GETTEXT
+(void)
+{
+#ifdef HAVE_USELOCALE
+	int i;
+	for (i = 0; i < nLocalesLoaded; ++i) {
+		if (Empty_Locale != wc_locales[i])
+			freelocale(wc_locales[i]);
+	}
+	free(wc_locales);
+#endif
+	if (!AvailLangLoaded) free(AvailLangLoaded);
+}
+
 }