Generate a static

Author: tamird

ext/mysql2/mysql_enc_name_to_ruby.h

@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.3 */
+/* C code produced by gperf version 3.0.4 */
 /* Command-line: gperf  */
 /* Computed positions: -k'1,3,$' */
 
@@ -40,9 +40,9 @@ inline
 #endif
 #endif
 static unsigned int
-mysql2_mysql_enc_name_to_rb_hash(str, len)
+mysql2_mysql_enc_name_to_rb_hash (str, len)
      register const char *str;
-     register const unsigned int len;
+     register unsigned int len;
 {
   static const unsigned char asso_values[] =
     {
@@ -78,14 +78,14 @@ mysql2_mysql_enc_name_to_rb_hash(str, len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct mysql2_mysql_enc_name_to_rb_map *
-mysql2_mysql_enc_name_to_rb(str, len)
+mysql2_mysql_enc_name_to_rb (str, len)
      register const char *str;
-     register const unsigned int len;
+     register unsigned int len;
 {
   enum
     {
@@ -154,9 +154,9 @@ mysql2_mysql_enc_name_to_rb(str, len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register const unsigned int key = mysql2_mysql_enc_name_to_rb_hash(str, len);
+      register int key = mysql2_mysql_enc_name_to_rb_hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register const char *s = wordlist[key].name;
 

ext/mysql2/mysql_enc_to_ruby.h

@@ -1,4 +1,4 @@
-const char *mysql2_mysql_enc_to_rb[] = {
+static const char *mysql2_mysql_enc_to_rb[] = {
   "Big5",
   "ISO-8859-2",
   NULL,
@@ -54,13 +54,13 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "macRoman",
   "UTF-16",
   "UTF-16",
-  NULL,
+  "",
   "Windows-1256",
   "Windows-1257",
   "Windows-1257",
   "UTF-32",
   "UTF-32",
-  NULL,
+  "",
   "ASCII-8BIT",
   NULL,
   "US-ASCII",
@@ -119,10 +119,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16",
   "UTF-16",
   "UTF-16",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
   NULL,
   NULL,
   NULL,
@@ -146,18 +146,22 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16BE",
   "UTF-16BE",
   "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16BE",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
   "UTF-32",
   "UTF-32",
   "UTF-32",
@@ -178,10 +182,6 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-32",
   "UTF-32",
   "UTF-32",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
   NULL,
   NULL,
   NULL,
@@ -210,18 +210,22 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8",
   "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   "UTF-8",
   "UTF-8",
   "UTF-8",
@@ -243,4 +247,3 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8"
 };
-

support/mysql_enc_to_ruby.rb

@@ -76,7 +76,6 @@
 
 # start printing output
 
-puts "const char *mysql2_mysql_enc_to_rb[] = {"
+puts "static const char *mysql2_mysql_enc_to_rb[] = {"
 puts encodings_with_nil.join(",\n")
 puts "};"
-puts