Improve country() by using "static const" for lookup table (makes function 25% smaller)

and const-correctness.  Add .mobi TLD.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@112 13b04d17-f746-0410-82c6-800466cd88b0

Changelog

@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* Improve country() and add .mobi TLD. (caf)
+
 * Apply fixes from darkfires removing non-standard use of arithmetic on
   void * values, to allow building on Irix. (caf)
 

include/misc.h

@@ -118,7 +118,7 @@ ChannelList *	BX_prepare_command (int *, char *, int);
 
 	int		timer_unban (void *, char *);
 	void		check_server_connect (int);
-	char		*country(char *);
+	const char	*country(char *);
 	int		do_newuser (char *, char *, char *);
 	int		char_fucknut (register unsigned char *, char, int);
 	BanList		*ban_is_on_channel(register char *, register ChannelList *);

source/functions.c

@@ -5487,7 +5487,6 @@ BUILT_IN_FUNCTION(function_irclib, input)
 
 BUILT_IN_FUNCTION(function_country, input)
 {
-extern char *country(char *);
 	RETURN_STR(country(input));
 }
 

source/misc.c

@@ -4902,14 +4902,13 @@ void check_server_connect(int server)
 #endif
 }
 
-char *country(char *hostname)
+const char *country(char *hostname)
 {
 #ifndef BITCHX_LITE
-typedef struct _domain {
-char *code;
-char *country;
-} Domain;
-Domain domain[] = {
+static const struct {
+	const char *code;
+	const char *country;
+} domain[] = {
 	{"AC", "Ascension Island" },
 	{"AD", "Andorra" },
 	{"AE", "United Arab Emirates" },
@@ -5166,6 +5165,7 @@ Domain domain[] = {
 	{"INFO", "Informational" },
 	{"INT", "International" },
 	{"MIL", "United States Military" },
+	{"MOBI", "Mobile Device" },
 	{"MUSEUM", "Museum" },
 	{"NET", "Network" },
 	{"NAME", "Individuals" },