Fix compiler errors related to unused results

This commit is contained in:
Johan Wikman
2019-01-30 15:22:19 +02:00
parent 0ee63578d0
commit 968743f61a
3 changed files with 37 additions and 10 deletions

View File

@ -118,12 +118,21 @@ int authMaxScale(int so, char* user, char* password)
{ {
return 0; return 0;
} }
write(so, user, strlen(user)); int len;
len = strlen(user);
if (write(so, user, len) != len)
{
return 0;
}
if (read(so, buf, 8) != 8) if (read(so, buf, 8) != 8)
{ {
return 0; return 0;
} }
write(so, password, strlen(password)); len = strlen(password);
if (write(so, password, len) != len)
{
return 0;
}
if (read(so, buf, 6) != 6) if (read(so, buf, 6) != 6)
{ {
return 0; return 0;

View File

@ -55,6 +55,18 @@ static void signal_set(int sig, void (* handler)(int))
while (errno == EINTR); while (errno == EINTR);
} }
static int call_system(const char* command)
{
int rv = system(command);
if (rv == -1)
{
printf("error: Could not execute '%s'.\n", command);
}
return rv;
}
void sigfatal_handler(int i) void sigfatal_handler(int i)
{ {
dump_stacktrace(); dump_stacktrace();
@ -175,7 +187,10 @@ TestConnections::TestConnections(int argc, char* argv[])
break; break;
case 'q': case 'q':
freopen("/dev/null", "w", stdout); if (!freopen("/dev/null", "w", stdout))
{
printf("warning: Could not redirect stdout to /dev/null.\n");
}
break; break;
case 'h': case 'h':
@ -381,7 +396,7 @@ TestConnections::TestConnections(int argc, char* argv[])
char str[1024]; char str[1024];
sprintf(str, "mkdir -p LOGS/%s", test_name); sprintf(str, "mkdir -p LOGS/%s", test_name);
system(str); call_system(str);
timeout = 999999999; timeout = 999999999;
set_log_copy_interval(999999999); set_log_copy_interval(999999999);
@ -711,7 +726,7 @@ void TestConnections::process_template(int m, const char* template_name, const c
ss << str; ss << str;
ss << template_file << " > maxscale.cnf"; ss << template_file << " > maxscale.cnf";
system(ss.str().c_str()); call_system(ss.str().c_str());
maxscales->copy_to_node_legacy("maxscale.cnf", dest, m); maxscales->copy_to_node_legacy("maxscale.cnf", dest, m);
// The config will now be in ~/maxscale.cnf and is moved into /etc before restarting maxscale // The config will now be in ~/maxscale.cnf and is moved into /etc before restarting maxscale
@ -752,7 +767,7 @@ void TestConnections::init_maxscale(int m)
sprintf(dtr, "%s/certs/", maxscales->access_homedir[m]); sprintf(dtr, "%s/certs/", maxscales->access_homedir[m]);
maxscales->copy_to_node_legacy(str, dtr, m); maxscales->copy_to_node_legacy(str, dtr, m);
sprintf(str, "cp %s/ssl-cert/* .", test_dir); sprintf(str, "cp %s/ssl-cert/* .", test_dir);
system(str); call_system(str);
maxscales->ssh_node_f(m, true, "chmod -R a+rx %s;", maxscales->access_homedir[m]); maxscales->ssh_node_f(m, true, "chmod -R a+rx %s;", maxscales->access_homedir[m]);
} }
@ -812,7 +827,7 @@ int TestConnections::copy_all_logs()
char str[PATH_MAX + 1]; char str[PATH_MAX + 1];
sprintf(str, "mkdir -p LOGS/%s", test_name); sprintf(str, "mkdir -p LOGS/%s", test_name);
system(str); call_system(str);
std::vector<std::thread> threads; std::vector<std::thread> threads;
@ -853,7 +868,7 @@ int TestConnections::copy_maxscale_logs(double timestamp)
{ {
sprintf(log_dir_i, "%s/%03d", log_dir, i); sprintf(log_dir_i, "%s/%03d", log_dir, i);
sprintf(sys, "mkdir -p %s", log_dir_i); sprintf(sys, "mkdir -p %s", log_dir_i);
system(sys); call_system(sys);
if (strcmp(maxscales->IP[i], "127.0.0.1") != 0) if (strcmp(maxscales->IP[i], "127.0.0.1") != 0)
{ {
int rc = maxscales->ssh_node_f(i, true, int rc = maxscales->ssh_node_f(i, true,
@ -2042,14 +2057,14 @@ int TestConnections::take_snapshot(char* snapshot_name)
{ {
char str[4096]; char str[4096];
sprintf(str, "%s %s", take_snapshot_command, snapshot_name); sprintf(str, "%s %s", take_snapshot_command, snapshot_name);
return system(str); return call_system(str);
} }
int TestConnections::revert_snapshot(char* snapshot_name) int TestConnections::revert_snapshot(char* snapshot_name)
{ {
char str[4096]; char str[4096];
sprintf(str, "%s %s", revert_snapshot_command, snapshot_name); sprintf(str, "%s %s", revert_snapshot_command, snapshot_name);
return system(str); return call_system(str);
} }
bool TestConnections::test_bad_config(int m, const char* config) bool TestConnections::test_bad_config(int m, const char* config)

View File

@ -21,10 +21,13 @@ namespace maxbase
static inline void default_stacktrace_handler(const char* symbol, const char* command) static inline void default_stacktrace_handler(const char* symbol, const char* command)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
write(STDOUT_FILENO, symbol, strlen(symbol)); write(STDOUT_FILENO, symbol, strlen(symbol));
write(STDOUT_FILENO, ": ", 2); write(STDOUT_FILENO, ": ", 2);
write(STDOUT_FILENO, command, strlen(command)); write(STDOUT_FILENO, command, strlen(command));
write(STDOUT_FILENO, "\n", 1); write(STDOUT_FILENO, "\n", 1);
#pragma GCC diagnostic pop
} }
void dump_stacktrace(void (* handler)(const char* symbol, const char* command) = default_stacktrace_handler); void dump_stacktrace(void (* handler)(const char* symbol, const char* command) = default_stacktrace_handler);