Bug#53445: Build with -Wall and fix warnings that it generates

Fix various mismatches between function's language linkage. Any
particular function that is declared in C++ but should be callable
from C must have C linkage. Note that function types with different
linkages are also distinct. Thus, if a function type is declared in
C code, it will have C linkage (same if declared in a extern "C"
block).

1 files changed, 19 insertions, 11 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 24d520ff97f..d0c948e67bb 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -77,6 +77,12 @@
 static int setenv(const char *name, const char *value, int overwrite);
 #endif
 
+C_MODE_START
+static sig_handler signal_handler(int sig);
+static my_bool get_one_option(int optid, const struct my_option *,
+                              char *argument);
+C_MODE_END
+
 enum {
   OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION,
   OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
@@ -462,7 +468,6 @@ void log_msg(const char *fmt, ...)
 VAR* var_from_env(const char *, const char *);
 VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
               int val_len);
-void var_free(void* v);
 VAR* var_get(const char *var_name, const char** var_name_end,
              my_bool raw, my_bool ignore_not_existing);
 void eval_expr(VAR* v, const char *p, const char** p_end);
@@ -1914,6 +1919,8 @@ static void strip_parentheses(struct st_command *command)
 }
 
 
+C_MODE_START
+
 static uchar *get_var_key(const uchar* var, size_t *len,
                           my_bool __attribute__((unused)) t)
 {
@@ -1924,6 +1931,16 @@ static uchar *get_var_key(const uchar* var, size_t *len,
 }
 
 
+static void var_free(void *v)
+{
+  my_free(((VAR*) v)->str_val, MYF(MY_WME));
+  if (((VAR*)v)->alloced)
+    my_free(v, MYF(MY_WME));
+}
+
+C_MODE_END
+
+
 VAR *var_init(VAR *v, const char *name, int name_len, const char *val,
               int val_len)
 {
@@ -1966,14 +1983,6 @@ VAR *var_init(VAR *v, const char *name, int name_len, const char *val,
 }
 
 
-void var_free(void *v)
-{
-  my_free(((VAR*) v)->str_val, MYF(MY_WME));
-  if (((VAR*)v)->alloced)
-    my_free(v, MYF(MY_WME));
-}
-
-
 VAR* var_from_env(const char *name, const char *def_val)
 {
   const char *tmp;
@@ -6070,8 +6079,7 @@ void read_embedded_server_arguments(const char *name)
 
 
 static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
+get_one_option(int optid, const struct my_option *, char *argument)
 {
   switch(optid) {
   case '#':