Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

jhauglid · jhauglid · commit 557db85ec7e4 · 2017-03-15T16:31:30.000+01:00
Patch mysql#18: Fix -Wunused-parameter warnings in clients and plugins.
diff --git a/client/base/abstract_program.cc b/client/base/abstract_program.cc
@@ -29,9 +29,7 @@ using std::vector;
 extern const char *load_default_groups[];
 
 bool Abstract_program::callback_option_parsed(
-  int optid,
-  const struct my_option *opt MY_ATTRIBUTE((unused)),
-  char *argument)
+  int, const struct my_option *opt, char *argument)
 {
   // Check if option uses My::Tools::Base::Options, and it should.
   Options::I_option* app_type = (Options::I_option*)opt->app_type;
diff --git a/client/dump/abstract_chain_element.cc b/client/dump/abstract_chain_element.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ Item_processing_data* Abstract_chain_element::new_task_created(
 }
 
 Item_processing_data* Abstract_chain_element::new_chain_created(
-  Chain_data* new_chain_data, Item_processing_data* parent_processing_data,
+  Chain_data*, Item_processing_data* parent_processing_data,
   I_chain_element* child_chain_element)
 {
   Item_processing_data* new_item_to_process=
diff --git a/client/dump/abstract_mysql_chain_element_extension.cc b/client/dump/abstract_mysql_chain_element_extension.cc
@@ -80,7 +80,7 @@ Mysql::Nullable<std::string>
   Abstract_mysql_chain_element_extension::get_create_statement(
     Mysql::Tools::Base::Mysql_query_runner* runner,
     const std::string& database_name, const std::string& object_name,
-    const std::string& object_type, uint field_id/*= 1*/)
+    const std::string& object_type, uint)
 {
   std::vector<const Mysql::Tools::Base::Mysql_query_runner::Row*> result;
 
diff --git a/client/dump/abstract_progress_watcher.cc b/client/dump/abstract_progress_watcher.cc
@@ -71,7 +71,7 @@ Abstract_progress_watcher::Abstract_progress_watcher(
   m_last_step_countdown(1)
 {}
 
-void Abstract_progress_watcher::crawler_completed(I_crawler* crawler)
+void Abstract_progress_watcher::crawler_completed(I_crawler*)
 {}
 
 void Abstract_progress_watcher::object_processing_ended(
@@ -107,7 +107,7 @@ void Abstract_progress_watcher::object_processing_ended(
 }
 
 void Abstract_progress_watcher::object_processing_started(
-  Item_processing_data* process_data)
+  Item_processing_data*)
 {}
 
 void Abstract_progress_watcher::new_chain_created(
diff --git a/client/dump/mysqldump_tool_chain_maker.cc b/client/dump/mysqldump_tool_chain_maker.cc
@@ -31,12 +31,11 @@
 using namespace Mysql::Tools::Dump;
 using std::placeholders::_1;
 
-void Mysqldump_tool_chain_maker::delete_chain(
-  uint64 chain_id, I_object_reader* chain)
+void Mysqldump_tool_chain_maker::delete_chain(uint64, I_object_reader*)
 {}
 
 I_object_reader* Mysqldump_tool_chain_maker::create_chain(
-  Chain_data* chain_data, I_dump_task* dump_task)
+  Chain_data*, I_dump_task* dump_task)
 {
   Table_rows_dump_task* rows_task= dynamic_cast<Table_rows_dump_task*>(
     dump_task);
diff --git a/client/dump/single_transaction_connection_provider.cc b/client/dump/single_transaction_connection_provider.cc
@@ -24,8 +24,7 @@ using namespace Mysql::Tools::Dump;
 
 Mysql::Tools::Base::Mysql_query_runner*
   Single_transaction_connection_provider::create_new_runner(
-    std::function<bool(const Mysql::Tools::Base::Message_data&)>*
-      message_handler)
+    std::function<bool(const Mysql::Tools::Base::Message_data&)>*)
 {
   Mysql::Tools::Base::Mysql_query_runner* runner= NULL;
   my_boost::mutex::scoped_lock lock(m_pool_mutex);
diff --git a/client/dump/sql_formatter.cc b/client/dump/sql_formatter.cc
@@ -264,7 +264,7 @@ void Sql_formatter::format_database_start(
     this->append_output(database->get_sql_formatted_definition() + ";\n");
 }
 
-void Sql_formatter::format_dump_end(Dump_end_dump_task* dump_start_dump_task)
+void Sql_formatter::format_dump_end(Dump_end_dump_task*)
 {
   std::ostringstream out;
   std::time_t sys_time = std::chrono::system_clock::to_time_t(
diff --git a/client/dump/standard_progress_watcher.cc b/client/dump/standard_progress_watcher.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 using namespace Mysql::Tools::Dump;
 
 void Standard_progress_watcher::process_progress_step(
-  Abstract_progress_watcher::Progress_data& change)
+  Abstract_progress_watcher::Progress_data&)
 {
   std::cerr << "Dump progress: " << m_last_progress.m_table_count << "/"
     << m_total.m_table_count << " tables, " << m_last_progress.m_row_count
diff --git a/client/logger.cc b/client/logger.cc
@@ -23,7 +23,7 @@
 
 using namespace std;
 
-ostream &operator<<(ostream &os, const Datetime &dt)
+ostream &operator<<(ostream &os, const Datetime&)
 {
   const char format[]= "%Y-%m-%d %X";
   time_t t(time(NULL));
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1181,10 +1181,10 @@ static void mysql_end_timer(ulong start_time,char *buff);
 static void nice_time(double sec,char *buff,bool part_second);
 static void kill_query(const char* reason);
 extern "C" void mysql_end(int sig);
-extern "C" void handle_ctrlc_signal(int sig);
+extern "C" void handle_ctrlc_signal(int);
 extern "C" void handle_quit_signal(int sig);
 #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
-static void window_resize(int sig);
+static void window_resize(int);
 #endif
 
 const char DELIMITER_NAME[]= "delimiter";
@@ -1541,11 +1541,9 @@ void mysql_end(int sig)
     This function handles SIGINT (Ctrl - C). It sends a 'KILL [QUERY]' command
     to the server if a query is currently executing. On Windows, 'Ctrl - Break'
     is treated alike.
-
-  @param sig               Signal number
 */
 
-void handle_ctrlc_signal(int sig)
+void handle_ctrlc_signal(int)
 {
   sigint_received= 1;
 
@@ -1638,7 +1636,7 @@ void kill_query(const char *reason)
 
 
 #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
-void window_resize(int sig)
+void window_resize(int)
 {
   struct winsize window_size;
 
diff --git a/client/mysql_config_editor.cc b/client/mysql_config_editor.cc
@@ -246,9 +246,7 @@ my_program_get_one_option(int optid,
 }
 
 static bool
-my_set_command_get_one_option(int optid,
-                              const struct my_option *opt MY_ATTRIBUTE((unused)),
-                              char *argument)
+my_set_command_get_one_option(int optid, const struct my_option *, char*)
 {
   switch(optid) {
   case 'p':
@@ -273,9 +271,7 @@ my_set_command_get_one_option(int optid,
 }
 
 static bool
-my_remove_command_get_one_option(int optid,
-                                 const struct my_option *opt MY_ATTRIBUTE((unused)),
-                                 char *argument)
+my_remove_command_get_one_option(int optid, const struct my_option*, char*)
 {
   switch(optid) {
   case 'G':
@@ -297,9 +293,7 @@ my_remove_command_get_one_option(int optid,
 }
 
 static bool
-my_print_command_get_one_option(int optid,
-                                const struct my_option *opt MY_ATTRIBUTE((unused)),
-                                char *argument)
+my_print_command_get_one_option(int optid, const struct my_option*, char*)
 {
   switch(optid) {
   case 'G':
@@ -321,9 +315,7 @@ my_print_command_get_one_option(int optid,
 }
 
 static bool
-my_reset_command_get_one_option(int optid,
-                                const struct my_option *opt MY_ATTRIBUTE((unused)),
-                                char *argument)
+my_reset_command_get_one_option(int optid, const struct my_option*, char*)
 {
   switch(optid) {
   case '?':
diff --git a/client/mysql_ssl_rsa_setup.cc b/client/mysql_ssl_rsa_setup.cc
@@ -360,9 +360,7 @@ void usage(void)
 
 extern "C" {
 static bool
-my_arguments_get_one_option(int optid,
-                            const struct my_option *opt MY_ATTRIBUTE((unused)),
-                            char *argument)
+my_arguments_get_one_option(int optid, const struct my_option*, char*)
 {
   switch(optid){
     case '?':
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -2862,7 +2862,7 @@ static void do_source(struct st_command *command)
 
 
 static FILE* my_popen(DYNAMIC_STRING *ds_cmd, const char *mode,
-                      struct st_command *command)
+                      struct st_command *command MY_ATTRIBUTE((unused)))
 {
 #ifdef _WIN32
   /*
@@ -5483,7 +5483,7 @@ static bool kill_process(int pid)
   @param pid  Process id.
   @param path Path to create minidump file in.
 */
-static void abort_process(int pid, const char *path)
+static void abort_process(int pid, const char *path MY_ATTRIBUTE((unused)))
 {
 #ifdef _WIN32
   HANDLE proc;
diff --git a/client/upgrade/program.cc b/client/upgrade/program.cc
@@ -59,7 +59,7 @@ const int SYS_PROCEDURE_COUNT = 26;
 /**
   Error callback to be called from mysql_check functionality.
  */
-static void mysql_check_error_callback(MYSQL *mysql, string when)
+static void mysql_check_error_callback(MYSQL*, string)
 {
   mysql_check_errors= 1;
 }
@@ -203,7 +203,7 @@ class Program : public Base::Abstract_connection_program
     EXIT_MYSQL_CHECK_ERROR - Error during calling mysql_check functionality.
     EXIT_UPGRADING_QUERIES_ERROR - Error during execution of upgrading queries.
    */
-  int execute(vector<string> positional_options)
+  int execute(vector<string>)
   {
     /*
       Disables output buffering to make printing to stdout and stderr order
diff --git a/sql/locking_service_udf.cc b/sql/locking_service_udf.cc
@@ -80,8 +80,8 @@ bool service_get_read_locks_init(UDF_INIT *initid, UDF_ARGS *args,
 }
 
 
-long long service_get_read_locks(UDF_INIT *initid, UDF_ARGS *args,
-                                 char *is_null, char *error)
+long long service_get_read_locks(UDF_INIT*, UDF_ARGS *args,
+                                 char*, char*)
 {
   const char *lock_namespace= args->args[0];
   long long timeout= *((long long*)args->args[args->arg_count - 1]);
@@ -102,8 +102,8 @@ bool service_get_write_locks_init(UDF_INIT *initid, UDF_ARGS *args,
 }
 
 
-long long service_get_write_locks(UDF_INIT *initid, UDF_ARGS *args,
-                                  char *is_null, char *error)
+long long service_get_write_locks(UDF_INIT*, UDF_ARGS *args,
+                                  char*, char*)
 {
   const char *lock_namespace= args->args[0];
   long long timeout= *((long long*)args->args[args->arg_count - 1]);
@@ -143,8 +143,8 @@ bool service_release_locks_init(UDF_INIT *initid, UDF_ARGS *args,
 }
 
 
-long long service_release_locks(UDF_INIT *initid, UDF_ARGS *args,
-                                char *is_null, char *error)
+long long service_release_locks(UDF_INIT*, UDF_ARGS *args,
+                                char*, char*)
 {
   const char *lock_namespace= args->args[0];
   // For the UDF 1 == success, 0 == failure.
diff --git a/sql/log_event.cc b/sql/log_event.cc
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
diff --git a/sql/udf_example.cc b/sql/udf_example.cc
diff --git a/strings/ctype-uca.cc b/strings/ctype-uca.cc
diff --git a/utilities/comp_client_err.cc b/utilities/comp_client_err.cc

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`
`4`	`4`	`This program is free software; you can redistribute it and/or modify`
`5`	`5`	`it under the terms of the GNU General Public License as published by`
`@@ -73,7 +73,7 @@ Item_processing_data* Abstract_chain_element::new_task_created(`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`Item_processing_data* Abstract_chain_element::new_chain_created(`
`76`		`- Chain_data* new_chain_data, Item_processing_data* parent_processing_data,`
	`76`	`+ Chain_data, Item_processing_data parent_processing_data,`
`77`	`77`	`I_chain_element* child_chain_element)`
`78`	`78`	`{`
`79`	`79`	`Item_processing_data* new_item_to_process=`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ Mysql::Nullable<std::string>`
`80`	`80`	`Abstract_mysql_chain_element_extension::get_create_statement(`
`81`	`81`	`Mysql::Tools::Base::Mysql_query_runner* runner,`
`82`	`82`	`const std::string& database_name, const std::string& object_name,`
`83`		`- const std::string& object_type, uint field_id/= 1/)`
	`83`	`+ const std::string& object_type, uint)`
`84`	`84`	`{`
`85`	`85`	`std::vector<const Mysql::Tools::Base::Mysql_query_runner::Row*> result;`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ using namespace Mysql::Tools::Dump;`
`24`	`24`
`25`	`25`	`Mysql::Tools::Base::Mysql_query_runner*`
`26`	`26`	`Single_transaction_connection_provider::create_new_runner(`
`27`		`- std::function<bool(const Mysql::Tools::Base::Message_data&)>*`
`28`		`- message_handler)`
	`27`	`+ std::function<bool(const Mysql::Tools::Base::Message_data&)>*)`
`29`	`28`	`{`
`30`	`29`	`Mysql::Tools::Base::Mysql_query_runner* runner= NULL;`
`31`	`30`	`my_boost::mutex::scoped_lock lock(m_pool_mutex);`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ void Sql_formatter::format_database_start(`
`264`	`264`	`this->append_output(database->get_sql_formatted_definition() + ";\n");`
`265`	`265`	`}`
`266`	`266`
`267`		`-void Sql_formatter::format_dump_end(Dump_end_dump_task* dump_start_dump_task)`
	`267`	`+void Sql_formatter::format_dump_end(Dump_end_dump_task*)`
`268`	`268`	`{`
`269`	`269`	`std::ostringstream out;`
`270`	`270`	`std::time_t sys_time = std::chrono::system_clock::to_time_t(`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`using namespace std;`
`25`	`25`
`26`		`-ostream &operator<<(ostream &os, const Datetime &dt)`
	`26`	`+ostream &operator<<(ostream &os, const Datetime&)`
`27`	`27`	`{`
`28`	`28`	`const char format[]= "%Y-%m-%d %X";`
`29`	`29`	`time_t t(time(NULL));`