Code cleanup: change parameter "uchar *element" of insert_dynamic()

Guilhem Bichot · Guilhem Bichot · commit 8a0d30a1a3af · 2010-11-05T23:14:29.000+01:00
and set_dynamic() to "const void *": to show that it does not change
the element, and to eliminate many casts.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -463,7 +463,7 @@ Exit_status Load_log_processor::process_first_event(const char *bname,
      after Execute_load_query_log_event or Execute_load_log_event
      will have been processed, otherwise in Load_log_processor::destroy()
   */
-  if (set_dynamic(&file_names, (uchar*)&rec, file_id))
+  if (set_dynamic(&file_names, &rec, file_id))
   {
     error("Out of memory.");
     my_free(fname);
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
@@ -754,7 +754,7 @@ static void print_result()
       */
       if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&
 	  strcmp(row[3],"OK"))
-	insert_dynamic(&tables4repair, (uchar*) prev);
+	insert_dynamic(&tables4repair, prev);
       found_error=0;
       if (opt_silent)
 	continue;
@@ -774,7 +774,7 @@ static void print_result()
   }
   /* add the last table to be repaired to the list */
   if (found_error && opt_auto_repair && what_to_do != DO_REPAIR)
-    insert_dynamic(&tables4repair, (uchar*) prev);
+    insert_dynamic(&tables4repair, prev);
   mysql_free_result(res);
 }
 
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -6081,7 +6081,7 @@ int read_command(struct st_command** command_ptr)
   if (!(*command_ptr= command=
         (struct st_command*) my_malloc(sizeof(*command),
                                        MYF(MY_WME|MY_ZEROFILL))) ||
-      insert_dynamic(&q_lines, (uchar*) &command))
+      insert_dynamic(&q_lines, &command))
     die("Out of memory");
   command->type= Q_UNKNOWN;
 
@@ -6580,7 +6580,7 @@ void init_win_path_patterns()
       continue;
     }
 
-    if (insert_dynamic(&patterns, (uchar*) &p))
+    if (insert_dynamic(&patterns, &p))
       die("Out of memory");
 
     DBUG_PRINT("info", ("p: %s", p));
@@ -9092,7 +9092,7 @@ struct st_replace_regex* init_replace_regex(char* expr)
       reg.icase= 1;
 
     /* done parsing the statement, now place it in regex_arr */
-    if (insert_dynamic(&res->regex_arr,(uchar*) &reg))
+    if (insert_dynamic(&res->regex_arr, &reg))
       die("Out of memory");
   }
   res->odd_buf_len= res->even_buf_len= 8192;
@@ -10108,7 +10108,7 @@ void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING *ds_input)
     *line_end= 0;
 
     /* Insert pointer to the line in array */
-    if (insert_dynamic(&lines, (uchar*) &start))
+    if (insert_dynamic(&lines, &start))
       die("Out of memory inserting lines to sort");
 
     start= line_end+1;
diff --git a/extra/comp_err.c b/extra/comp_err.c
@@ -496,7 +496,7 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
 		current_error->er_name, current_message.lang_short_name);
 	DBUG_RETURN(0);
       }
-      if (insert_dynamic(&current_error->msg, (uchar *) & current_message))
+      if (insert_dynamic(&current_error->msg, &current_message))
 	DBUG_RETURN(0);
       continue;
     }
diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c
@@ -230,7 +230,7 @@ static void init_sym_table()
     SYM_ENTRY se;
     if (init_sym_entry(&se, buf))
       continue;
-    if (insert_dynamic(&sym_table, (uchar*)&se))
+    if (insert_dynamic(&sym_table, &se))
       die("insert_dynamic() failed - looks like we are out of memory");
   }
 
diff --git a/include/my_sys.h b/include/my_sys.h
@@ -778,10 +778,11 @@ extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
 /* init_dynamic_array() function is deprecated */
 extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
                                   uint init_alloc, uint alloc_increment);
-extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,uchar * element);
+extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void *element);
 extern uchar *alloc_dynamic(DYNAMIC_ARRAY *array);
 extern uchar *pop_dynamic(DYNAMIC_ARRAY*);
-extern my_bool set_dynamic(DYNAMIC_ARRAY *array,uchar * element,uint array_index);
+extern my_bool set_dynamic(DYNAMIC_ARRAY *array, const void *element,
+                           uint array_index);
 extern my_bool allocate_dynamic(DYNAMIC_ARRAY *array, uint max_elements);
 extern void get_dynamic(DYNAMIC_ARRAY *array,uchar * element,uint array_index);
 extern void delete_dynamic(DYNAMIC_ARRAY *array);
diff --git a/mysys/array.c b/mysys/array.c
@@ -92,7 +92,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
     FALSE	Ok
 */
 
-my_bool insert_dynamic(DYNAMIC_ARRAY *array, uchar* element)
+my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void *element)
 {
   uchar* buffer;
   if (array->elements == array->max_element)
@@ -196,7 +196,7 @@ uchar *pop_dynamic(DYNAMIC_ARRAY *array)
     FALSE	Ok
 */
 
-my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx)
+my_bool set_dynamic(DYNAMIC_ARRAY *array, const void *element, uint idx)
 {
   if (idx >= array->elements)
   {
diff --git a/mysys/default.c b/mysys/default.c
@@ -321,7 +321,7 @@ static int handle_default_option(void *in_ctx, const char *group_name,
   {
     if (!(tmp= alloc_root(ctx->alloc, strlen(option) + 1)))
       return 1;
-    if (insert_dynamic(ctx->args, (uchar*) &tmp))
+    if (insert_dynamic(ctx->args, &tmp))
       return 1;
     strmov(tmp, option);
   }
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
@@ -52,7 +52,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
     strmake(buff, pathlist, (uint) (end-pathlist));
     length= cleanup_dirname(buff, buff);
     if (!(copy= my_strndup(buff, length, MYF(MY_WME))) ||
-        insert_dynamic(&tmpdir->full_list, (uchar*) &copy))
+        insert_dynamic(&tmpdir->full_list, &copy))
       DBUG_RETURN(TRUE);
     pathlist=end+1;
   }
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -1186,7 +1186,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
   }
 
   if (!(tmp= my_strdup(cmd,MYF(MY_WME))) ||
-      insert_dynamic(options->init_commands, (uchar*)&tmp))
+      insert_dynamic(options->init_commands, &tmp))
   {
     my_free(tmp);
     return 1;
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -5051,7 +5051,7 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
   }
   /* Mark that this variable has been used by this query */
   var_entry->used_query_id= thd->query_id;
-  if (insert_dynamic(&thd->user_var_events, (uchar*) &user_var_event))
+  if (insert_dynamic(&thd->user_var_events, &user_var_event))
     goto err;
 
   *out_entry= var_entry;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -6669,7 +6669,7 @@ SHOW_VAR status_vars[]= {
 bool add_terminator(DYNAMIC_ARRAY *options)
 {
   my_option empty_element= {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0};
-  return insert_dynamic(options, (uchar *)&empty_element);
+  return insert_dynamic(options, &empty_element);
 }
 
 #ifndef EMBEDDED_LIBRARY
@@ -7323,7 +7323,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
   for (my_option *opt= my_long_options;
        opt < my_long_options + array_elements(my_long_options) - 1;
        opt++)
-    insert_dynamic(&all_options, (uchar*) opt);
+    insert_dynamic(&all_options, opt);
   sys_var_add_options(&all_options, sys_var::PARSE_NORMAL);
   add_terminator(&all_options);
 
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
@@ -8132,7 +8132,7 @@ get_quick_keys(PARAM *param,QUICK_RANGE_SELECT *quick,KEY_PART *key,
   set_if_bigger(quick->max_used_key_length, range->min_length);
   set_if_bigger(quick->max_used_key_length, range->max_length);
   set_if_bigger(quick->used_key_parts, (uint) key_tree->part+1);
-  if (insert_dynamic(&quick->ranges, (uchar*) &range))
+  if (insert_dynamic(&quick->ranges, &range))
     return 1;
 
  end:
@@ -8336,7 +8336,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
     key_part->null_bit=     key_info->key_part[part].null_bit;
     key_part->flag=         (uint8) key_info->key_part[part].key_part_flag;
   }
-  if (insert_dynamic(&quick->ranges,(uchar*)&range))
+  if (insert_dynamic(&quick->ranges, &range))
     goto err;
 
   /*
@@ -8357,7 +8357,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
                       make_prev_keypart_map(ref->key_parts), EQ_RANGE)))
       goto err;
     *ref->null_ref_key= 0;		// Clear null byte
-    if (insert_dynamic(&quick->ranges,(uchar*)&null_range))
+    if (insert_dynamic(&quick->ranges, &null_range))
       goto err;
   }
 
@@ -10846,7 +10846,7 @@ bool QUICK_GROUP_MIN_MAX_SELECT::add_range(SEL_ARG *sel_range)
                          range_flag);
   if (!range)
     return TRUE;
-  if (insert_dynamic(&min_max_ranges, (uchar*)&range))
+  if (insert_dynamic(&min_max_ranges, &range))
     return TRUE;
   return FALSE;
 }
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
@@ -466,7 +466,7 @@ Rpl_filter::add_table_rule_to_array(DYNAMIC_ARRAY* a, const char* table_spec)
   e->key_len= len;
   memcpy(e->db, table_spec, len);
 
-  if (insert_dynamic(a, (uchar*)&e))
+  if (insert_dynamic(a, &e))
   {
     my_free(e);
     return 1;
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc
@@ -202,7 +202,7 @@ void delegates_destroy()
       r= 0;                                                             \
       break;                                                            \
     }                                                                   \
-    insert_dynamic(plugins, (uchar *)&plugin);                          \
+    insert_dynamic(plugins, &plugin);                                   \
     if (((Observer *)info->observer)->f                                 \
         && ((Observer *)info->observer)->f args)                        \
     {                                                                   \
diff --git a/sql/rpl_slave.cc b/sql/rpl_slave.cc
@@ -5619,7 +5619,7 @@ bool change_master(THD* thd, Master_info* mi)
                   mi->ignore_server_ids->server_ids.elements, sizeof(ulong),
                   (int (*) (const void*, const void*))
                   change_master_server_id_cmp) == NULL)
-        insert_dynamic(&mi->ignore_server_ids->server_ids, (uchar*) &s_id);
+        insert_dynamic(&mi->ignore_server_ids->server_ids, &s_id);
     }
   }
   sort_dynamic(&mi->ignore_server_ids->server_ids, (qsort_cmp) change_master_server_id_cmp);
@@ -5825,7 +5825,7 @@ bool Server_ids::unpack_server_ids(const char *param_server_ids)
     else
     {
       ulong val= atol(token);
-      insert_dynamic(&server_ids, (uchar *) &val);
+      insert_dynamic(&server_ids, &val);
     }
   }
   DBUG_RETURN(FALSE);
diff --git a/sql/set_var.h b/sql/set_var.h
@@ -134,7 +134,7 @@ class sys_var
   bool register_option(DYNAMIC_ARRAY *array, int parse_flags)
   {
     return (option.id != -1) && (m_parse_flag & parse_flags) &&
-           insert_dynamic(array, (uchar*)&option);
+           insert_dynamic(array, &option);
   }
 
 private:
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
@@ -2703,7 +2703,7 @@ int sp_head::add_instr(sp_instr *instr)
     entire stored procedure, as their life span is equal.
   */
   instr->mem_root= &main_mem_root;
-  return insert_dynamic(&m_instr, (uchar*)&instr);
+  return insert_dynamic(&m_instr, &instr);
 }
 
 
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
@@ -263,7 +263,7 @@ sp_pcontext::push_variable(LEX_STRING *name, enum enum_field_types type,
   p->mode= mode;
   p->offset= current_var_count();
   p->dflt= NULL;
-  if (insert_dynamic(&m_vars, (uchar*)&p))
+  if (insert_dynamic(&m_vars, &p))
     return NULL;
   return p;
 }
@@ -318,7 +318,7 @@ sp_pcontext::push_cond(LEX_STRING *name, sp_cond_type_t *val)
   p->name.str= name->str;
   p->name.length= name->length;
   p->val= val;
-  return insert_dynamic(&m_conds, (uchar *)&p);
+  return insert_dynamic(&m_conds, &p);
 }
 
 /*
@@ -390,7 +390,7 @@ sp_pcontext::push_cursor(LEX_STRING *name)
     m_max_cursor_index+= 1;
   n.str= name->str;
   n.length= name->length;
-  return insert_dynamic(&m_cursors, (uchar *)&n);
+  return insert_dynamic(&m_cursors, &n);
 }
 
 /*
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
@@ -279,7 +279,7 @@ class sp_pcontext : public Sql_alloc
   inline bool
   push_case_expr_id(int case_expr_id)
   {
-    return insert_dynamic(&m_case_expr_id_lst, (uchar*) &case_expr_id);
+    return insert_dynamic(&m_case_expr_id_lst, &case_expr_id);
   }
 
   inline void
@@ -342,7 +342,7 @@ class sp_pcontext : public Sql_alloc
   inline void
   push_handler(sp_cond_type_t *cond)
   {
-    insert_dynamic(&m_handlers, (uchar*)&cond);
+    insert_dynamic(&m_handlers, &cond);
   }
 
   bool
diff --git a/sql/sql_array.h b/sql/sql_array.h
@@ -53,7 +53,7 @@ template <class Elem> class Dynamic_array
 
   bool append(Elem &el)
   {
-    return (insert_dynamic(&array, (uchar*)&el));
+    return (insert_dynamic(&array, &el));
   }
 
   int elements()
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
@@ -131,7 +131,7 @@ static my_bool acquire_plugins(THD *thd, plugin_ref plugin, void *arg)
   
   /* lock the plugin and add it to the list */
   plugin= my_plugin_lock(NULL, &plugin);
-  insert_dynamic(&thd->audit_class_plugins, (uchar*) &plugin);
+  insert_dynamic(&thd->audit_class_plugins, &plugin);
 
   return 0;
 }
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
@@ -377,7 +377,7 @@ static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl)
       DBUG_RETURN(tmp);
     }
   }
-  if (insert_dynamic(&plugin_dl_array, (uchar*)&plugin_dl))
+  if (insert_dynamic(&plugin_dl_array, &plugin_dl))
     DBUG_RETURN(0);
   tmp= *dynamic_element(&plugin_dl_array, plugin_dl_array.elements - 1,
                         struct st_plugin_dl **)=
@@ -694,7 +694,7 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc)
                        (long) current_thd, pi->name.str, pi->ref_count));
 
     if (lex)
-      insert_dynamic(&lex->plugins, (uchar*)&plugin);
+      insert_dynamic(&lex->plugins, &plugin);
     DBUG_RETURN(plugin);
   }
   DBUG_RETURN(NULL);
@@ -741,7 +741,7 @@ static st_plugin_int *plugin_insert_or_reuse(struct st_plugin_int *plugin)
       DBUG_RETURN(tmp);
     }
   }
-  if (insert_dynamic(&plugin_array, (uchar*)&plugin))
+  if (insert_dynamic(&plugin_array, &plugin))
     DBUG_RETURN(0);
   tmp= *dynamic_element(&plugin_array, plugin_array.elements - 1,
                         struct st_plugin_int **)=
@@ -1367,7 +1367,7 @@ static bool register_builtin(struct st_mysql_plugin *plugin,
   tmp->ref_count= 0;
   tmp->plugin_dl= 0;
 
-  if (insert_dynamic(&plugin_array, (uchar*)&tmp))
+  if (insert_dynamic(&plugin_array, &tmp))
     DBUG_RETURN(1);
 
   *ptr= *dynamic_element(&plugin_array, plugin_array.elements - 1,
@@ -3473,7 +3473,7 @@ void add_plugin_options(DYNAMIC_ARRAY *options, MEM_ROOT *mem_root)
     /* Only options with a non-NULL comment are displayed in help text */
     for (;opt->name; opt++)
       if (opt->comment)
-        insert_dynamic(options, (uchar*) opt);
+        insert_dynamic(options, opt);
   }
 }
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
diff --git a/sql/uniques.cc b/sql/uniques.cc
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ Exit_status Load_log_processor::process_first_event(const char *bname,`
`463`	`463`	`after Execute_load_query_log_event or Execute_load_log_event`
`464`	`464`	`will have been processed, otherwise in Load_log_processor::destroy()`
`465`	`465`	`*/`
`466`		`- if (set_dynamic(&file_names, (uchar*)&rec, file_id))`
	`466`	`+ if (set_dynamic(&file_names, &rec, file_id))`
`467`	`467`	`{`
`468`	`468`	`error("Out of memory.");`
`469`	`469`	`my_free(fname);`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ static int parse_input_file(const char file_name, struct errors *top_error,`
`496`	`496`	`current_error->er_name, current_message.lang_short_name);`
`497`	`497`	`DBUG_RETURN(0);`
`498`	`498`	`}`
`499`		`- if (insert_dynamic(&current_error->msg, (uchar *) & current_message))`
	`499`	`+ if (insert_dynamic(&current_error->msg, &current_message))`
`500`	`500`	`DBUG_RETURN(0);`
`501`	`501`	`continue;`
`502`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ static void init_sym_table()`
`230`	`230`	`SYM_ENTRY se;`
`231`	`231`	`if (init_sym_entry(&se, buf))`
`232`	`232`	`continue;`
`233`		`- if (insert_dynamic(&sym_table, (uchar*)&se))`
	`233`	`+ if (insert_dynamic(&sym_table, &se))`
`234`	`234`	`die("insert_dynamic() failed - looks like we are out of memory");`
`235`	`235`	`}`
`236`	`236`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,`
`92`	`92`	`FALSE Ok`
`93`	`93`	`*/`
`94`	`94`
`95`		`-my_bool insert_dynamic(DYNAMIC_ARRAY array, uchar element)`
	`95`	`+my_bool insert_dynamic(DYNAMIC_ARRAY array, const void element)`
`96`	`96`	`{`
`97`	`97`	`uchar* buffer;`
`98`	`98`	`if (array->elements == array->max_element)`
`@@ -196,7 +196,7 @@ uchar pop_dynamic(DYNAMIC_ARRAY array)`
`196`	`196`	`FALSE Ok`
`197`	`197`	`*/`
`198`	`198`
`199`		`-my_bool set_dynamic(DYNAMIC_ARRAY array, uchar element, uint idx)`
	`199`	`+my_bool set_dynamic(DYNAMIC_ARRAY array, const void element, uint idx)`
`200`	`200`	`{`
`201`	`201`	`if (idx >= array->elements)`
`202`	`202`	`{`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ static int handle_default_option(void in_ctx, const char group_name,`
`321`	`321`	`{`
`322`	`322`	`if (!(tmp= alloc_root(ctx->alloc, strlen(option) + 1)))`
`323`	`323`	`return 1;`
`324`		`- if (insert_dynamic(ctx->args, (uchar*) &tmp))`
	`324`	`+ if (insert_dynamic(ctx->args, &tmp))`
`325`	`325`	`return 1;`
`326`	`326`	`strmov(tmp, option);`
`327`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ my_bool init_tmpdir(MY_TMPDIR tmpdir, const char pathlist)`
`52`	`52`	`strmake(buff, pathlist, (uint) (end-pathlist));`
`53`	`53`	`length= cleanup_dirname(buff, buff);`
`54`	`54`	`if (!(copy= my_strndup(buff, length, MYF(MY_WME))) \|\|`
`55`		`- insert_dynamic(&tmpdir->full_list, (uchar*) &copy))`
	`55`	`+ insert_dynamic(&tmpdir->full_list, &copy))`
`56`	`56`	`DBUG_RETURN(TRUE);`
`57`	`57`	`pathlist=end+1;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ static int add_init_command(struct st_mysql_options options, const char cmd)`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`	`1188`	`if (!(tmp= my_strdup(cmd,MYF(MY_WME))) \|\|`
`1189`		`- insert_dynamic(options->init_commands, (uchar*)&tmp))`
	`1189`	`+ insert_dynamic(options->init_commands, &tmp))`
`1190`	`1190`	`{`
`1191`	`1191`	`my_free(tmp);`
`1192`	`1192`	`return 1;`