Skip to content
Extraits de code Groupes Projets
Valider 5974e1ba rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Merge branch 'fix' into 'master'

Fix

See merge request !62
parents f91b38df 2b0dca53
Branches
Étiquettes v1.2
1 requête de fusion!62Fix
......@@ -756,8 +756,8 @@ lkt_listen(void)
/* Initialize the system. */
RETURN_UNLESS(database_new(&srv.db), "Failed to initialize the memory database", 1);
RETURN_UNLESS(config_detect_file(conf_file, PATH_MAX), "Failed to find a config file", 1);
RETURN_UNLESS(config_new(srv.db, conf_file), "Failed to read configuration file", 1);
RETURN_IF(config_detect_file(conf_file, PATH_MAX), "Failed to find a config file", 1);
RETURN_IF(config_new(srv.db, conf_file), "Failed to read configuration file", 1);
/* Finish to initialize. */
RETURN_UNLESS(database_config_get_text(srv.db, "database", "db_path", db_path, PATH_MAX), "Cfg error", 2);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter