From 452cd6ae0eae30986ee8dfdc99a815d207eb7674 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 2 May 2020 09:22:01 +0200
Subject: [PATCH] It compiles
---
src/config.c | 2 +-
src/net/listen.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/config.c b/src/config.c
index 204ffbc4..e36fcf6b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -93,7 +93,7 @@ ini_parse(const char *path, ini_handler handle, volatile sqlite3 *db)
/* Handle the SECTION, NAME[:=]VALUE */
if (handle(db, section, name, value)) {
error = 1;
- LOG_ERROR_SCT("PARSER", "Failed to handle %s, %s[:=]%s at line '%d'",
+ LOG_ERROR_SCT("PARSER", "Failed to '[handle] %s, %s{:,=}%s' at line '%d'",
section, name, value, linenum);
}
}
diff --git a/src/net/listen.c b/src/net/listen.c
index 30f5e578..e7211030 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -4,7 +4,6 @@
#include <lektor/common.h>
#include <lektor/database.h>
#include <lektor/net.h>
-#include <ini/ini.h>
#include <sqlite3.h>
@@ -697,7 +696,7 @@ lkt_listen(void)
char *const kara_dir = memory + PATH_MAX + 1; /* Size is PATH_MAX. */
char *const host = kara_dir + PATH_MAX + 1; /* Size is HOST_NAME_MAX. */
char port[7]; /* Maximal port number is 65535, +2 for '\n' and '\0' */
- char player_mod[INI_MAX_LINE];
+ char player_mod[INI_MAX_LINE_LEN];
char conf_file[PATH_MAX];
memset(&srv, 0, sizeof(struct lkt_state));
@@ -711,11 +710,11 @@ lkt_listen(void)
RETURN_UNLESS(database_open(srv.db, db_path), "Can't open database", 1);
/* Read the configuration. */
- RETURN_UNLESS(database_config_get_int (srv.db, "player", "autoclear", &autoclear), "Cfg error", 2);
- RETURN_UNLESS(database_config_get_text(srv.db, "database", "kara_dir", kara_dir, PATH_MAX), "Cfg error", 2);
- RETURN_UNLESS(database_config_get_text(srv.db, "server", "host", host, HOST_NAME_MAX), "Cfg error", 2);
- RETURN_UNLESS(database_config_get_text(srv.db, "server", "port", port, 5), "Cfg error", 2);
- RETURN_UNLESS(database_config_get_text(srv.db, "player", "module", player_mod, INI_MAX_LINE), "Cfg error", 2);
+ RETURN_UNLESS(database_config_get_int (srv.db, "player", "autoclear", &autoclear), "Cfg error", 2);
+ RETURN_UNLESS(database_config_get_text(srv.db, "database", "kara_dir", kara_dir, PATH_MAX), "Cfg error", 2);
+ RETURN_UNLESS(database_config_get_text(srv.db, "server", "host", host, HOST_NAME_MAX), "Cfg error", 2);
+ RETURN_UNLESS(database_config_get_text(srv.db, "server", "port", port, 5), "Cfg error", 2);
+ RETURN_UNLESS(database_config_get_text(srv.db, "player", "module", player_mod, INI_MAX_LINE_LEN), "Cfg error", 2);
if (kara_dir[strlen(kara_dir) - 1] != '/')
strncat(kara_dir, "/", PATH_MAX - 1);
--
GitLab