From e656d4a171ef9141ecebd567494b5d767c76dfb7 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 31 Jul 2020 19:13:11 +0200
Subject: [PATCH] Making the project compiling again after changing the names
NOTE: Build only with clang, see why
---
inc/Makefile.in | 2 +-
inc/lektor/net.h | 2 +-
inc/lektor/reg.h | 2 +-
man/Makefile.am | 4 ++--
man/Makefile.in | 4 ++--
scripts/{astyle.sh => astyle.bash} | 0
scripts/{cscope.sh => cscope.bash} | 0
scripts/{karafont.sh => karafont.bash} | 0
scripts/{manpage.sh => manpage.bash} | 0
scripts/validate.bash | 0
src/Makefile.am | 12 ++++++------
src/Makefile.in | 12 ++++++------
src/base/cmd.c | 10 +++++-----
src/base/commands.c | 4 ++--
src/base/config.c | 12 ++++++------
src/database/playlist.c | 8 ++++----
src/main/lkt.c | 4 ++--
src/main/server.c | 2 +-
src/module/module_repo.c | 24 ++++++++++++------------
src/module/mpv.c | 16 ++++++++--------
src/net/listen.c | 16 ++++++++--------
21 files changed, 67 insertions(+), 67 deletions(-)
rename scripts/{astyle.sh => astyle.bash} (100%)
rename scripts/{cscope.sh => cscope.bash} (100%)
rename scripts/{karafont.sh => karafont.bash} (100%)
rename scripts/{manpage.sh => manpage.bash} (100%)
mode change 100644 => 100755
mode change 100644 => 100755 scripts/validate.bash
diff --git a/inc/Makefile.in b/inc/Makefile.in
index 67b1bc66..593219d5 100644
--- a/inc/Makefile.in
+++ b/inc/Makefile.in
@@ -304,7 +304,7 @@ top_srcdir = @top_srcdir@
nobase_include_HEADERS = lektor/cmd.h lektor/commands.h \
lektor/config.h lektor/database.h lektor/mkv.h lektor/net.h \
lektor/reg.h lektor/thread.h lektor/uri.h lektor/bufferfd.h \
- lektor/common.h lektor/macro.h lektor/queue.h lektor/stack.h
+ lektor/common.h lektor/queue.h lektor/stack.h
all: all-am
.SUFFIXES:
diff --git a/inc/lektor/net.h b/inc/lektor/net.h
index d5bc4d36..d74fa7c6 100644
--- a/inc/lektor/net.h
+++ b/inc/lektor/net.h
@@ -50,7 +50,7 @@ struct lkt_state {
size_t fds_len;
size_t fds_max;
char host[HOST_NAME_MAX];
- char port[INI_MAX_LINE_LEN];
+ char port[LKT_LINE_MAX];
struct queue queue;
volatile sqlite3 *db;
diff --git a/inc/lektor/reg.h b/inc/lektor/reg.h
index 5460b531..d1bb317d 100644
--- a/inc/lektor/reg.h
+++ b/inc/lektor/reg.h
@@ -3,7 +3,7 @@
struct lkt_state;
-#include <lektor/macro.h>
+#include <lektor/common.h>
#include <stdarg.h>
typedef int (*reg_func)(va_list *);
diff --git a/man/Makefile.am b/man/Makefile.am
index 73c62e72..512e43ac 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
notrans_dist_man1_MANS = lektor.man lektord.man lkt.man
-MAN = $(abs_top_srcdir)/scripts/manpager.sh
+MAN = $(abs_top_srcdir)/scripts/manpager.bash
.template.man:
- $(MAN) $<
+ $(MAN) $<
diff --git a/man/Makefile.in b/man/Makefile.in
index f7940461..d6f911c2 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -207,7 +207,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
-MAN = $(abs_top_srcdir)/scripts/manpager.sh
+MAN = $(abs_top_srcdir)/scripts/manpager.bash
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
@@ -526,7 +526,7 @@ uninstall-man: uninstall-man1
.template.man:
- $(MAN) $<
+ $(MAN) $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scripts/astyle.sh b/scripts/astyle.bash
similarity index 100%
rename from scripts/astyle.sh
rename to scripts/astyle.bash
diff --git a/scripts/cscope.sh b/scripts/cscope.bash
similarity index 100%
rename from scripts/cscope.sh
rename to scripts/cscope.bash
diff --git a/scripts/karafont.sh b/scripts/karafont.bash
similarity index 100%
rename from scripts/karafont.sh
rename to scripts/karafont.bash
diff --git a/scripts/manpage.sh b/scripts/manpage.bash
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/manpage.sh
rename to scripts/manpage.bash
diff --git a/scripts/validate.bash b/scripts/validate.bash
old mode 100644
new mode 100755
diff --git a/src/Makefile.am b/src/Makefile.am
index 82967b0e..ef372ad8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,13 +60,13 @@ endif
# Generated with `xxd`
database/disk.c: database/disk.sql
- echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
- $(XXD) -i < $< >> $@
- echo ', 0x00 };' >> $@
+ @echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ $(AM_V_GEN) echo ', 0x00 };' >> $@
database/memory.c: database/memory.sql
- echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
- $(XXD) -i < $< >> $@
- echo ', 0x00 };' >> $@
+ @echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ $(AM_V_GEN) echo ', 0x00 };' >> $@
CLEANFILES = database/disk.c database/memory.c
EXTRA_DIST = database/disk.sql database/memory.sql
diff --git a/src/Makefile.in b/src/Makefile.in
index 76ff6ee6..434d4c8f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1326,13 +1326,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
# Generated with `xxd`
database/disk.c: database/disk.sql
- echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
- $(XXD) -i < $< >> $@
- echo ', 0x00 };' >> $@
+ @echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ $(AM_V_GEN) echo ', 0x00 };' >> $@
database/memory.c: database/memory.sql
- echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
- $(XXD) -i < $< >> $@
- echo ', 0x00 };' >> $@
+ @echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ $(AM_V_GEN) echo ', 0x00 };' >> $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/base/cmd.c b/src/base/cmd.c
index 99cabff7..9e7d729c 100644
--- a/src/base/cmd.c
+++ b/src/base/cmd.c
@@ -23,11 +23,11 @@ print_help(void)
}
noreturn void
-lkt_cmd_parse(struct lkt_cmd_opt *opts, int argc, const char **argv)
+cmd_parse(struct cmd_opt *opts, int argc, const char **argv)
{
int count = 0, is_ok, offset = 0;
- struct lkt_cmd_opt *it = opts;
- lkt_cmd_callback call[2] = { NULL, NULL };
+ struct cmd_opt *it = opts;
+ cmd_callback call[2] = { NULL, NULL };
if (argc == 0 || *argv == NULL || ! strcasecmp(argv[0], "help") ||
! strcasecmp(argv[0], "--help") || ! strcasecmp(argv[0], "-help"))
@@ -48,7 +48,7 @@ lkt_cmd_parse(struct lkt_cmd_opt *opts, int argc, const char **argv)
if (!call[1] || count == 0)
goto not_found;
- struct lkt_cmd_args arguments = {
+ struct cmd_args arguments = {
.argc = argc - 1,
.argv = (const char **) & (argv[1]),
};
@@ -60,7 +60,7 @@ lkt_cmd_parse(struct lkt_cmd_opt *opts, int argc, const char **argv)
not_found:
/* The default function */
if (!it->name && it->call) {
- struct lkt_cmd_args arguments = {
+ struct cmd_args arguments = {
.argc = argc,
.argv = (const char **) argv,
};
diff --git a/src/base/commands.c b/src/base/commands.c
index f17b0453..f23d55bb 100644
--- a/src/base/commands.c
+++ b/src/base/commands.c
@@ -20,7 +20,7 @@
inline bool
command_restart(struct lkt_state *srv, size_t c,
- char __attribute__((unused)) *argv[LKT_MESSAGE_ARGS_MAX])
+ char __attribute__((unused)) *__argv[LKT_MESSAGE_ARGS_MAX])
{
const char *const argv[] = { executable_name, NULL };
struct lkt_queue_state sta = {0};
@@ -361,7 +361,7 @@ command_move(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX])
}
bool
-command_help(struct lkt_state *srv, size_t c, , char __attribute__((unused)) *args[LKT_MESSAGE_ARGS_MAX])
+command_help(struct lkt_state *srv, size_t c, char __attribute__((unused)) *args[LKT_MESSAGE_ARGS_MAX])
{
struct lkt_message *out;
out = lkt_message_new();
diff --git a/src/base/config.c b/src/base/config.c
index aeb955a0..711df535 100644
--- a/src/base/config.c
+++ b/src/base/config.c
@@ -79,7 +79,7 @@ static inline int
ini_parse(const char *path, volatile sqlite3 *db)
{
char *start, *end, *name, *value;
- char section[INI_MAX_SECTION_LEN], line[INI_MAX_LINE_LEN];
+ char section[LKT_LINE_MAX], line[LKT_LINE_MAX];
int error = 0, linenum = 0, len;
FILE *file = fopen(path, "r");
if (!file) {
@@ -87,11 +87,11 @@ ini_parse(const char *path, volatile sqlite3 *db)
return 1;
}
- memset(section, 0, INI_MAX_SECTION_LEN);
- memset(line, 0, INI_MAX_LINE_LEN);
+ memset(section, 0, LKT_LINE_MAX);
+ memset(line, 0, LKT_LINE_MAX);
/* Parse the file */
- while (NULL != fgets(line, INI_MAX_LINE_LEN, file)) {
+ while (NULL != fgets(line, LKT_LINE_MAX, file)) {
++linenum;
start = skip(strip(line));
@@ -105,9 +105,9 @@ ini_parse(const char *path, volatile sqlite3 *db)
if (end[0] == ']') {
end[0] = '\0';
len = strlen(&start[1]);
- len = MIN(len + 1, INI_MAX_SECTION_LEN);
+ len = MIN(len + 1, LKT_LINE_MAX);
memcpy(section, &start[1], len);
- section[INI_MAX_SECTION_LEN - 1] = '\0';
+ section[LKT_LINE_MAX - 1] = '\0';
}
else {
diff --git a/src/database/playlist.c b/src/database/playlist.c
index c13f1e70..c94fcdf1 100644
--- a/src/database/playlist.c
+++ b/src/database/playlist.c
@@ -110,8 +110,8 @@ database_plt_export(volatile sqlite3 *db, const char *name)
goto error;
}
- GOTO_UNLESS(strcasecmp(name, PROTECTED_DATABASE), "Name '"
- PROTECTED_DATABASE "' is protected, you can't use "
+ GOTO_UNLESS(strcasecmp(name, LKT_PROTECTED_DATABASE), "Name '"
+ LKT_PROTECTED_DATABASE "' is protected, you can't use "
"it for a playlist name", error);
safe_snprintf(SQL_STMT, LKT_MAX_SQLITE_STATEMENT, SQL_SCHEM, name);
@@ -146,8 +146,8 @@ database_plt_import(volatile sqlite3 *db, const char *name)
goto error;
}
- GOTO_UNLESS(strcasecmp(name, PROTECTED_DATABASE), "Name '"
- PROTECTED_DATABASE "' is protected, you can't use "
+ GOTO_UNLESS(strcasecmp(name, LKT_PROTECTED_DATABASE), "Name '"
+ LKT_PROTECTED_DATABASE "' is protected, you can't use "
"it for a playlist name", error);
safe_snprintf(SQL_STMT, LKT_MAX_SQLITE_STATEMENT, SQL_SCHEM, name,
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 6a4d1319..f69d2352 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -985,7 +985,7 @@ static struct cmd_opt options_queue[] = {
CMD_OPT_DEFAULT(queue_list__),
};
-static struct md_opt options_plt[] = {
+static struct cmd_opt options_plt[] = {
{ .name = "add", .call = plt_add__ },
{ .name = "delete", .call = plt_delete__ },
{ .name = "destroy", .call = plt_destroy__ },
@@ -1055,7 +1055,7 @@ static struct cmd_opt options_[] = {
{ .name = "search", .call = search__ },
{ .name = "admin", .call = admin__ },
{ .name = "stickers", .call = stickers__ },
- LKT_OPT_NULL,
+ CMD_OPT_NULL,
};
/* The sigpipe function, if SIGPIPE signal is sent. */
diff --git a/src/main/server.c b/src/main/server.c
index 2f798509..e063a52e 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -18,9 +18,9 @@
#include <strings.h>
#include <pthread.h>
-REG_DECLARE(repo_reg)
#if defined (LKT_STATIC_MODULE)
REG_DECLARE(sdl2_reg)
+REG_DECLARE(repo_reg)
#endif
int
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index db590b0e..fde33df1 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -225,12 +225,12 @@ module_repo_new(struct module_repo_internal *repo_, struct queue *queue, volatil
.queue = queue,
.db = db,
.updating = 0,
- .name = safe_zero_malloc(INI_MAX_LINE_LEN * sizeof(char)),
- .kara_dir = safe_zero_malloc(PATH_MAX * sizeof(char)),
- .get_id_json = safe_zero_malloc(URL_MAX_LEN * sizeof(char)),
- .get_id_file = safe_zero_malloc(URL_MAX_LEN * sizeof(char)),
- .get_all_json = safe_zero_malloc(URL_MAX_LEN * sizeof(char)),
- .base_url = safe_zero_malloc(URL_MAX_LEN * sizeof(char)),
+ .name = safe_zero_malloc(LKT_LINE_MAX * sizeof(char)),
+ .kara_dir = safe_zero_malloc(PATH_MAX * sizeof(char)),
+ .get_id_json = safe_zero_malloc(LKT_LINE_MAX * sizeof(char)),
+ .get_id_file = safe_zero_malloc(LKT_LINE_MAX * sizeof(char)),
+ .get_all_json = safe_zero_malloc(LKT_LINE_MAX * sizeof(char)),
+ .base_url = safe_zero_malloc(LKT_LINE_MAX * sizeof(char)),
};
int workers_count;
@@ -244,12 +244,12 @@ module_repo_new(struct module_repo_internal *repo_, struct queue *queue, volatil
}
/* Copies */
- if (!database_config_get_text(db, "database", "kara_dir", repo.kara_dir, PATH_MAX - 1) ||
- !database_config_get_text(db, "repo", "name", repo.name, INI_MAX_LINE_LEN) ||
- !database_config_get_text(db, "repo", "url", repo.base_url, URL_MAX_LEN) ||
- !database_config_get_text(db, "repo", "id_json", repo.get_id_json, URL_MAX_LEN) ||
- !database_config_get_text(db, "repo", "id_kara", repo.get_id_file, URL_MAX_LEN) ||
- !database_config_get_text(db, "repo", "json", repo.get_all_json, URL_MAX_LEN))
+ if (!database_config_get_text(db, "database", "kara_dir", repo.kara_dir, PATH_MAX) ||
+ !database_config_get_text(db, "repo", "name", repo.name, LKT_LINE_MAX) ||
+ !database_config_get_text(db, "repo", "url", repo.base_url, LKT_LINE_MAX) ||
+ !database_config_get_text(db, "repo", "id_json", repo.get_id_json, LKT_LINE_MAX) ||
+ !database_config_get_text(db, "repo", "id_kara", repo.get_id_file, LKT_LINE_MAX) ||
+ !database_config_get_text(db, "repo", "json", repo.get_all_json, LKT_LINE_MAX) )
return 1;
memcpy(repo_, &repo, sizeof(struct module_repo_internal));
return 0;
diff --git a/src/module/mpv.c b/src/module/mpv.c
index 41ef21ce..b714f5cf 100644
--- a/src/module/mpv.c
+++ b/src/module/mpv.c
@@ -34,20 +34,20 @@ lmpv_prepare(volatile sqlite3 *db)
mpv_handle *ctx = mpv_create();
int status;
RETURN_UNLESS(ctx, "Failed to create context", NULL);
- char _opt[INI_MAX_LINE_LEN];
+ char _opt[LKT_LINE_MAX];
#define MPV_SET_OPTION(opt, value) \
if ((status = mpv_set_option_string(ctx, opt, value)) < 0) { \
- LOG_ERROR("WINDOW", "Failed to set %s to %s: %s", \
+ LOG_ERROR("WINDOW", "Failed to set %s to %s: %s", \
opt, value, mpv_error_string(status)); \
return NULL; \
}
-#define MPV_SET_FROM_INI(opt, section, key) \
- if (!database_config_get_text(db, section, key, _opt, INI_MAX_LINE_LEN)) { \
- LOG_WARN("WINDOW", "Failed to get option " \
- key " in section " section); \
- return ctx; \
- } \
+#define MPV_SET_FROM_INI(opt, section, key) \
+ if (!database_config_get_text(db, section, key, _opt, LKT_LINE_MAX)) { \
+ LOG_WARN("WINDOW", "Failed to get option " \
+ key " in section " section); \
+ return ctx; \
+ } \
MPV_SET_OPTION(opt, _opt);
MPV_SET_OPTION("input-default-bindings", "yes");
diff --git a/src/net/listen.c b/src/net/listen.c
index 5856127b..2442adae 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -153,11 +153,11 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
case MPD_IDLE_NONE:
/* Commands that requires authentification. */
if (STR_MATCH(cmd.name, "__adduser"))
- err = ! command_user_add(srv, c, srv->db, cmd.args);
+ err = ! command_user_add(srv, c, cmd.args);
else if (STR_MATCH(cmd.name, "__restart"))
- err = ! command_restart(srv, c);
+ err = ! command_restart(srv, c, NULL);
else if (STR_MATCH(cmd.name, "kill"))
- err = ! command_kill(srv, c);
+ err = ! command_kill(srv, c, NULL);
else if (STR_MATCH(cmd.name, "update"))
err = ! command_update(srv, c, cmd.args);
else if (STR_MATCH(cmd.name, "rescan"))
@@ -214,7 +214,7 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
}
else if (STR_MATCH(cmd.name, "help"))
- err = !command_help(srv, c);
+ err = !command_help(srv, c, NULL);
else if (STR_MATCH(cmd.name, "__insert"))
err = ! command_add(srv, cmd.args, 5);
@@ -226,7 +226,7 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
err = ! command_addid(srv, cmd.args);
else if (STR_MATCH(cmd.name, "deleteid"))
err = ! (cmd.args[0] != NULL &&
- command_delid(srv, cmd.args[0]));
+ command_delid(srv, cmd.args));
else if (STR_MATCH(cmd.name, "playlistclear"))
err = ! command_plt_clear(srv, cmd.args);
@@ -247,7 +247,7 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
else if (STR_MATCH(cmd.name, "listplaylistinfo"))
err = ! command_find(srv, c, cmd.args, cmd.cont, database_search_playlist_init);
else if (STR_MATCH(cmd.name, "listplaylists"))
- err = ! command_plt_list(srv, c, cmd.cont);
+ err = ! command_plt_list(srv, c, NULL, cmd.cont);
else if (STR_MATCH(cmd.name, "listplaylist"))
err = ! command_plt_ctx(srv, c, cmd.args, cmd.cont);
@@ -734,11 +734,11 @@ redo:
break;
case lkt_event_play_next:
- command_next(srv);
+ command_next(srv, NULL);
break;
case lkt_event_play_prev:
- command_previous(srv);
+ command_previous(srv, NULL);
break;
case lkt_event_play_toggle:
--
GitLab