Complamentatry fix to that of #575.

resolve_maxscale_homedir returned always false due to succp variable which wasn't updated in successful case.
This commit is contained in:
VilhoRaatikka
2014-10-14 18:13:04 +03:00
parent 80e4d733bd
commit 6707d6d0cf

View File

@ -539,7 +539,7 @@ return_succp:
static bool resolve_maxscale_homedir( static bool resolve_maxscale_homedir(
char** p_home_dir) char** p_home_dir)
{ {
bool succp = false; bool succp;
char* tmp; char* tmp;
char* log_context = NULL; char* log_context = NULL;
@ -627,15 +627,25 @@ check_home_dir:
free(errstr); free(errstr);
free(logstr); free(logstr);
succp = false;
} }
else if (!daemon_mode) else
{ {
fprintf(stderr, succp = true;
"Using %s as MAXSCALE_HOME = %s\n",
log_context, if (!daemon_mode)
tmp); {
fprintf(stderr,
"Using %s as MAXSCALE_HOME = %s\n",
log_context,
tmp);
}
} }
} }
else
{
succp = false;
}
free (tmp); free (tmp);
if (log_context != NULL) if (log_context != NULL)
@ -1392,7 +1402,7 @@ int main(int argc, char **argv)
{ {
if (!resolve_maxscale_homedir(&home_dir)) if (!resolve_maxscale_homedir(&home_dir))
{ {
ss_dassert(home_dir == NULL); ss_dassert(home_dir != NULL);
rc = MAXSCALE_HOMELESS; rc = MAXSCALE_HOMELESS;
goto return_main; goto return_main;
} }