diff --git a/inc/lektor/common.h b/inc/lektor/common.h
index 4dad1e6224b2a1c17cc0135819d3c4bbffba1616..19c6e825e6168157f03e41497c31878ade87b26f 100644
--- a/inc/lektor/common.h
+++ b/inc/lektor/common.h
@@ -136,15 +136,15 @@ void ___lkt_print(const char *section, const char *format, ...);
/* Default iteration count in search_iter */
#define LKT_DB_DEFAULT_ITERATION_MAX 100
-#define LEKTOR_TAG_MAX 256 /* Max length of a tag */
-#define LKT_COMMAND_LEN_MAX 32 /* MPD commands are at most 32 character long */
-#define LKT_MESSAGE_ARGS_MAX 32 /* At most 32 words in a command are supported */
-#define LKT_MESSAGE_MAX 2048 /* A message is at most <defined> chars long */
-#define LKT_DEFAULT_LIST_SIZE 10
+#define LEKTOR_TAG_MAX 256 /* Max length of a tag */
+#define LKT_COMMAND_LEN_MAX 32 /* MPD commands are at most 32 character long */
+#define LKT_MESSAGE_ARGS_MAX 32 /* At most 32 words in a command are supported */
+#define LKT_MESSAGE_MAX 2048 /* A message is at most <defined> chars long */
+#define LKT_DEFAULT_LIST_SIZE 10
#define LKT_BACKLOG 32
-#define COMMAND_LIST_MAX 64 /* At most 64 commands per client */
-#define BUFFER_OUT_MAX 16 /* At most 16 messages per client */
+#define COMMAND_LIST_MAX 64 /* At most 64 commands per client */
+#define BUFFER_OUT_MAX 16 /* At most 16 messages per client */
#define MPD_VERSION "0.21.16"
typedef volatile enum {
@@ -208,10 +208,10 @@ int safe_vsnprintf(char *dest, const size_t max_len, const char *format, va_list
char *safe_strncpy(char *dest, const char *src, size_t n);
/* Helpers for malloc functions. */
-#define LKT_ALLOC(___struct___) (___struct___ *)safe_malloc(sizeof(___struct___))
-#define LKT_ALLOC_STRUCT(___struct___) LKT_ALLOC(struct ___struct___)
-#define LKT_ALLOC_ARRAY(___struct___, ___count___) (___struct___ *) safe_malloc(sizeof(___struct___) * (___count___))
-#define LKT_ALLOC_STRUCT_ARRAY(___struct___, ___count___) LKT_ALLOC_ARRAY(struct ___struct___, ___count___)
+#define LKT_ALLOC(___struct___) (___struct___ *)safe_malloc(sizeof(___struct___))
+#define LKT_ALLOC_STRUCT(___struct___) LKT_ALLOC(struct ___struct___)
+#define LKT_ALLOC_ARRAY(___struct___, ___count___) (___struct___ *)safe_malloc(sizeof(___struct___) * (___count___))
+#define LKT_ALLOC_STRUCT_ARRAY(___struct___, ___count___) LKT_ALLOC_ARRAY(struct ___struct___, ___count___)
/* Iterate throught a string, copy each element in the dest string.
The save ptr must contains a null integer. */
diff --git a/src/database/cache.c b/src/database/cache.c
index b2801033dd39d582ebb1a3370e8b6922a4b30289..118c4fed8c8b8354a20dd5fa9f14166cac7e32b0 100644
--- a/src/database/cache.c
+++ b/src/database/cache.c
@@ -137,7 +137,7 @@ database_cache_kara(lkt_db *db, int id)
}
#define ___cache_set_from_id(what) \
- PRIVATE_FUNCTION bool database_set_kara_##what##_id(lkt_db *db, int id, uint64_t what) \
+ PRIVATE_FUNCTION bool database_set_kara_##what##_id(lkt_db *db, int id, uint64_t what) \
{ \
bool ret_code = false; \
sqlite3_stmt *stmt = NULL; \
@@ -158,7 +158,7 @@ database_cache_kara(lkt_db *db, int id)
}
#define ___cache_get_from_id(what) \
- bool database_get_kara_##what##_id(lkt_db *db, int id, uint64_t *what) \
+ bool database_get_kara_##what##_id(lkt_db *db, int id, uint64_t *what) \
{ \
bool ret_code = false; \
bool retry_once = false; \
@@ -182,7 +182,7 @@ database_cache_kara(lkt_db *db, int id)
/* Define get operation on the cache */
#define ___cache_get_from_path(what) \
- bool database_get_kara_##what##_path(lkt_db *db, char filepath[PATH_MAX], uint64_t *what) \
+ bool database_get_kara_##what##_path(lkt_db *db, char filepath[PATH_MAX], uint64_t *what) \
{ \
int id = 0; \
if (!database_get_kara_id(db, filepath, &id)) { \
diff --git a/src/database/queue.c b/src/database/queue.c
index 3b77910ed47ea50f3974c70c652a892c51098e5a..c88e5eb3baafd7fd6240fb176b0d738088c5deac 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -5,7 +5,7 @@
#include <lektor/internal/dbmacro.h>
#define sqlite_just_exec(func, query) \
- bool func(lkt_db *db) \
+ bool func(lkt_db *db) \
{ \
SQLITE_EXEC(db, "BEGIN TRANSACTION;" query "COMMIT;", error); \
return true; \
diff --git a/src/database/update.c b/src/database/update.c
index 79b6245076527b1f2791dff53d9e261b01daf889..e5a13b7729b83d0a33a155cddb70da05ccd41819 100644
--- a/src/database/update.c
+++ b/src/database/update.c
@@ -367,7 +367,7 @@ error:
}
#define sqlite_just_exec(func, query) \
- void func(lkt_db *db) \
+ void func(lkt_db *db) \
{ \
SQLITE_EXEC(db, query, error); \
error: \
diff --git a/src/main/server.c b/src/main/server.c
index 8eb87d838b1f409c31d1d84995f731a55e0e950b..93429bb89ecb5b171c5f4c5526d2875ed19ddcf2 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -99,8 +99,8 @@ main(int argc, char *argv[])
int autoclear;
int opt;
int check_exclusive = 1;
- int dump_and_abort = 0;
- char *conf_file = LKT_ALLOC_ARRAY(char, PATH_MAX);
+ int dump_and_abort = 0;
+ char *conf_file = LKT_ALLOC_ARRAY(char, PATH_MAX);
cmd_set_executable_name("lektord");
/* Check args */
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index 7ad0de78626943f740d6dbb32e9993b69860712e..6656a9e1ddf1ed56b95c005d22982fd0263689a1 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -798,9 +798,9 @@ mod_new(va_list *va)
va_list copy;
struct module_repo_internal **repo;
va_copy(copy, *va);
- repo = (struct module_repo_internal **)va_arg(copy, void **);
- struct queue *queue = va_arg(copy, struct queue *);
- lkt_db *db = va_arg(copy, lkt_db *);
+ repo = (struct module_repo_internal **)va_arg(copy, void **);
+ struct queue *queue = va_arg(copy, struct queue *);
+ lkt_db *db = va_arg(copy, lkt_db *);
if (NULL != *repo) {
LOG_ERROR("REPO", "Can't init two times the module");
diff --git a/src/module/module_sdl2.c b/src/module/module_sdl2.c
index 9330844ee6019dc1c9ea5eb7eb30508de2a04acb..f3792157b19502c0f2cea6f95a6cab2b0e430d99 100644
--- a/src/module/module_sdl2.c
+++ b/src/module/module_sdl2.c
@@ -120,10 +120,10 @@ mod_new(va_list *va)
va_list copy;
struct module_sdl2_window **win;
va_copy(copy, *va);
- win = (struct module_sdl2_window **)va_arg(copy, void **);
- struct queue *queue = va_arg(copy, struct queue *);
- lkt_db *db = va_arg(copy, lkt_db *);
- bool ret = module_sdl2_new(win, queue, db);
+ win = (struct module_sdl2_window **)va_arg(copy, void **);
+ struct queue *queue = va_arg(copy, struct queue *);
+ lkt_db *db = va_arg(copy, lkt_db *);
+ bool ret = module_sdl2_new(win, queue, db);
va_end(copy);
return !ret;
}
diff --git a/src/net/command.c b/src/net/command.c
index 3d72a8bd8b445548ffb6520190bc4ca6f5fb49e0..d0e17aa90c6e3c4ca82843017db1c18081cec2bb 100644
--- a/src/net/command.c
+++ b/src/net/command.c
@@ -17,18 +17,14 @@ lkt_command_parse(char *raw)
errno = 0;
char *endptr;
bool skip_continuation = false;
- struct lkt_command res = {
- .name = raw,
- .args = { 0 },
- .cont = strtol(raw, &endptr, 10)
- };
+ struct lkt_command res = { .name = raw, .args = { 0 }, .cont = strtol(raw, &endptr, 10) };
/* Do we need the continuation? */
if (errno != 0) {
- res.cont = 0;
+ res.cont = 0;
skip_continuation = true;
} else if (endptr == raw) {
- res.cont = 0;
+ res.cont = 0;
skip_continuation = true;
}
diff --git a/src/net/listen.c b/src/net/listen.c
index c2a40d589be421bb96df3c1a5f943b93312f3d12..e8f6cdd120f546c14a371427b89bed126b80ff4b 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -26,15 +26,15 @@
#define CHARS_MAX (sizeof(char) * 256)
typedef enum {
- LKT_COMMAND_NULL, /* Not a terminal node, so no commands */
- LKT_COMMAND_SIMPLE, /* srv, c, args */
- LKT_COMMAND_CONTINUATION, /* srv, c, args, int */
- LKT_COMMAND_ANON, /* srv, args */
+ LKT_COMMAND_NULL, /* Not a terminal node, so no commands */
+ LKT_COMMAND_SIMPLE, /* srv, c, args */
+ LKT_COMMAND_CONTINUATION, /* srv, c, args, int */
+ LKT_COMMAND_ANON, /* srv, args */
} LKT_COMMAND_TYPE;
struct cmd_trie_node {
- LKT_COMMAND_TYPE type; /* The type of the command, to reinterpret the function pointer */
- void (*cmd_ptr)(void); /* The function pointer of the command */
+ LKT_COMMAND_TYPE type; /* The type of the command, to reinterpret the function pointer */
+ void (*cmd_ptr)(void); /* The function pointer of the command */
struct cmd_trie_node *children[CHARS_MAX]; /* Childrens, a byte is 256 possible values */
};
@@ -71,8 +71,8 @@ cmd_trie_free(struct cmd_trie_node *root)
}
PRIVATE_FUNCTION void
-cmd_trie_insert(struct cmd_trie_node *root, const char *signed_cmd_name,
- void (*cmd_ptr)(void), LKT_COMMAND_TYPE cmd_type)
+cmd_trie_insert(struct cmd_trie_node *root, const char *signed_cmd_name, void (*cmd_ptr)(void),
+ LKT_COMMAND_TYPE cmd_type)
{
FAIL_UNLESS(root, "Passing an empty trie root");
unsigned const char *cmd_name = (unsigned const char *)signed_cmd_name;
@@ -367,8 +367,8 @@ command_list_begin(struct lkt_state *srv, size_t c, int list_ok)
static int
handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
{
- int err = 0;
- int continuation = 0;
+ int err = 0;
+ int continuation = 0;
struct cmd_trie_node *cmd_node = NULL;
union {
bool (*anon)(struct lkt_state *, char *[LKT_MESSAGE_ARGS_MAX]);
@@ -377,8 +377,8 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
void (*base_pointer)(void);
} handle_function;
- switch (lkt_client_get_mask(srv, c)) {
- case MPD_IDLE_NONE:
+ /* Commands that are available only if you are not in IDLE mode */
+ if (lkt_client_get_mask(srv, c) == MPD_IDLE_NONE) {
/* First try the 'fast' search with the trie structure */
cmd_node = cmd_trie_find(cmd_trie_root, cmd.name);
if (cmd_node != NULL) {
@@ -387,17 +387,17 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
switch (cmd_node->type) {
/* Basic command */
case LKT_COMMAND_SIMPLE:
- err = ! handle_function.simple(srv, c, cmd.args);
+ err = !handle_function.simple(srv, c, cmd.args);
break;
/* Anonymous client command */
case LKT_COMMAND_ANON:
- err = ! handle_function.anon(srv, cmd.args);
+ err = !handle_function.anon(srv, cmd.args);
break;
/* Need the continuation */
case LKT_COMMAND_CONTINUATION:
- err = ! handle_function.integer(srv, c, cmd.args, cmd.cont);
+ err = !handle_function.integer(srv, c, cmd.args, cmd.cont);
break;
/* Unreachable */
@@ -432,8 +432,8 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
}
else if (STR_MATCH(cmd.name, "search") || STR_MATCH(cmd.name, "find") || STR_MATCH(cmd.name, "list") ||
- STR_MATCH(cmd.name, "listall") || STR_MATCH(cmd.name, "listallinfo") ||
- STR_MATCH(cmd.name, "listfiles") || STR_MATCH(cmd.name, "lsinfo")) {
+ STR_MATCH(cmd.name, "listall") || STR_MATCH(cmd.name, "listallinfo") ||
+ STR_MATCH(cmd.name, "listfiles") || STR_MATCH(cmd.name, "lsinfo")) {
err = !command_find(srv, c, cmd.args, cmd.cont, database_search_database_init);
}
@@ -441,11 +441,10 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
else {
err = 2;
}
+ }
- break;
-
- default:
- /* commands available only in idle mode */
+ /* commands available only in IDLE mode */
+ else {
if (STR_MATCH(cmd.name, "idle")) {
err = !command_idle(srv, c, cmd.args);
goto end_no_send_status;
@@ -459,8 +458,6 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
else {
err = 2;
}
-
- break;
}
continuation = lkt_get_continuation(srv, c);