summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-14 09:06:38 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-14 13:36:10 +0300
commit7d51c35988186da89645d9873c5e9386fee0a9fc (patch)
tree500e3199ffd9f7f6cb12f3d4b308efa74a3d5cc5
parent11147bea20596b6f7bd3ff907d379667ae44b149 (diff)
downloadmariadb-git-7d51c35988186da89645d9873c5e9386fee0a9fc.tar.gz
Fix GCC -Wnonnull
-rw-r--r--client/mysqltest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index b363a3217cd..ada0da2e8ab 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -587,9 +587,10 @@ ATTRIBUTE_NORETURN
static void cleanup_and_exit(int exit_code);
ATTRIBUTE_NORETURN
-void really_die(const char *msg);
+static void really_die(const char *msg);
void report_or_die(const char *fmt, ...);
-void die(const char *fmt, ...);
+ATTRIBUTE_NORETURN
+static void die(const char *fmt, ...);
static void make_error_message(char *buf, size_t len, const char *fmt, va_list args);
ATTRIBUTE_NORETURN ATTRIBUTE_FORMAT(printf, 1, 2)
void abort_not_supported_test(const char *fmt, ...);
@@ -1554,7 +1555,7 @@ static void make_error_message(char *buf, size_t len, const char *fmt, va_list a
s+= my_snprintf(s, end -s, "\n", start_lineno);
}
-void die(const char *fmt, ...)
+static void die(const char *fmt, ...)
{
char buff[DIE_BUFF_SIZE];
va_list args;
@@ -1563,7 +1564,7 @@ void die(const char *fmt, ...)
really_die(buff);
}
-void really_die(const char *msg)
+static void really_die(const char *msg)
{
static int dying= 0;
fflush(stdout);