cleanup: CREATE_TYPELIB_FOR() helper

(cherry picked from commit d046aca)

Author: vuvova

client/mysqladmin.cc

@@ -111,8 +111,7 @@ static const char *command_names[]= {
   NullS
 };
 
-static TYPELIB command_typelib=
-{ array_elements(command_names)-1,"commands", command_names, NULL};
+static TYPELIB command_typelib= CREATE_TYPELIB_FOR(command_names);
 
 static struct my_option my_long_options[] =
 {

client/mysqlbinlog.cc

@@ -116,9 +116,7 @@ static bool one_database=0, one_table=0, to_last_remote_log= 0, disable_log_bin=
 static bool opt_hexdump= 0, opt_version= 0;
 const char *base64_output_mode_names[]=
 {"NEVER", "AUTO", "UNSPEC", "DECODE-ROWS", NullS};
-TYPELIB base64_output_mode_typelib=
-  { array_elements(base64_output_mode_names) - 1, "",
-    base64_output_mode_names, NULL };
+TYPELIB base64_output_mode_typelib=CREATE_TYPELIB_FOR(base64_output_mode_names);
 static enum_base64_output_mode opt_base64_output_mode= BASE64_OUTPUT_UNSPEC;
 static char *opt_base64_output_mode_str= NullS;
 static char* database= 0;

client/mysqlcheck.c

@@ -66,8 +66,7 @@ const char *operation_name[]=
 typedef enum { DO_VIEWS_NO, DO_VIEWS_YES, DO_UPGRADE, DO_VIEWS_FROM_MYSQL } enum_do_views;
 const char *do_views_opts[]= {"NO", "YES", "UPGRADE", "UPGRADE_FROM_MYSQL",
   NullS};
-TYPELIB do_views_typelib= { array_elements(do_views_opts) - 1, "",
-    do_views_opts, NULL };
+TYPELIB do_views_typelib= CREATE_TYPELIB_FOR(do_views_opts);
 static ulong opt_do_views= DO_VIEWS_NO;
 
 static struct my_option my_long_options[] =

client/mysqldump.cc

@@ -140,11 +140,7 @@ static my_bool  verbose= 0, opt_no_create_info= 0, opt_no_data= 0, opt_no_data_m
 #define OPT_SYSTEM_TIMEZONES 64
 static const char *opt_system_type_values[]=
   {"all", "users", "plugins",  "udfs", "servers", "stats", "timezones"};
-static TYPELIB opt_system_types=
-{
-  array_elements(opt_system_type_values), "system dump options",
-  opt_system_type_values, NULL
-};
+static TYPELIB opt_system_types=CREATE_TYPELIB_FOR(opt_system_type_values);
 static ulonglong opt_system= 0ULL;
 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0,
                select_field_names_inited= 0;
@@ -236,8 +232,7 @@ const char *compatible_mode_names[]=
  (1U<<6)  | /* MAXDB      */\
  (1U<<10)   /* ANSI       */\
 )
-TYPELIB compatible_mode_typelib= {array_elements(compatible_mode_names) - 1,
-                                  "", compatible_mode_names, NULL};
+TYPELIB compatible_mode_typelib= CREATE_TYPELIB_FOR(compatible_mode_names);
 
 #define MED_ENGINES "MRG_MyISAM, MRG_ISAM, CONNECT, OQGRAPH, SPIDER, VP, FEDERATED"
 

client/mysqltest.cc

@@ -595,8 +595,7 @@ struct st_command
   enum enum_commands type;
 };
 
-TYPELIB command_typelib= {array_elements(command_names),"",
-			  command_names, 0};
+TYPELIB command_typelib= CREATE_TYPELIB_FOR(command_names);
 
 DYNAMIC_STRING ds_res;
 /* Points to ds_warning in run_query, so it can be freed */

extra/mariabackup/xbcloud.cc

@@ -176,8 +176,7 @@ static enum {MODE_GET, MODE_PUT, MODE_DELETE} opt_mode;
 static char **file_list = NULL;
 static int file_list_size = 0;
 
-TYPELIB storage_typelib =
-{array_elements(storage_names)-1, "", storage_names, NULL};
+TYPELIB storage_typelib = CREATE_TYPELIB_FOR(storage_names);
 
 enum {
 	OPT_STORAGE = 256,

extra/mariabackup/xtrabackup.cc

@@ -389,8 +389,7 @@ static ulong innodb_flush_method;
 
 static const char *binlog_info_values[] = {"off", "lockless", "on", "auto",
 					   NullS};
-static TYPELIB binlog_info_typelib = {array_elements(binlog_info_values)-1, "",
-				      binlog_info_values, NULL};
+static TYPELIB binlog_info_typelib = CREATE_TYPELIB_FOR(binlog_info_values);
 ulong opt_binlog_info;
 
 char *opt_incremental_history_name;
@@ -407,8 +406,7 @@ char *opt_log_bin;
 
 const char *query_type_names[] = { "ALL", "UPDATE", "SELECT", NullS};
 
-TYPELIB query_type_typelib= {array_elements(query_type_names) - 1, "",
-	query_type_names, NULL};
+TYPELIB query_type_typelib= CREATE_TYPELIB_FOR(query_type_names);
 
 ulong opt_lock_wait_query_type;
 ulong opt_kill_long_query_type;

include/typelib.h

@@ -27,6 +27,8 @@ typedef struct st_typelib {	/* Different types saved here */
   unsigned int *type_lengths;
 } TYPELIB;
 
+#define CREATE_TYPELIB_FOR(X) { (unsigned int)(sizeof(X)/sizeof(X[0])) - 1, "", X, NULL }
+
 extern my_ulonglong find_typeset(const char *x, TYPELIB *typelib,
                                  int *error_position);
 extern int find_type_with_warning(const char *x, TYPELIB *typelib,

mysys/my_static.c

@@ -131,5 +131,4 @@ my_bool my_disable_copystat_in_redel=0;
 const char *sql_protocol_names_lib[] =
 { "TCP", "SOCKET", "PIPE", NullS };
 
-TYPELIB sql_protocol_typelib ={ array_elements(sql_protocol_names_lib) - 1, "",
-                                sql_protocol_names_lib, NULL };
+TYPELIB sql_protocol_typelib= CREATE_TYPELIB_FOR(sql_protocol_names_lib);

mysys/typelib.c

@@ -265,8 +265,7 @@ TYPELIB *copy_typelib(MEM_ROOT *root, const TYPELIB *from)
 
 
 static const char *on_off_default_names[]= { "off","on","default", 0};
-static TYPELIB on_off_default_typelib= {array_elements(on_off_default_names)-1,
-                                        "", on_off_default_names, 0};
+static TYPELIB on_off_default_typelib= CREATE_TYPELIB_FOR(on_off_default_names);
 
 /**
   Parse a TYPELIB name from the buffer