diff --git a/inc/lektor/commands.h b/inc/lektor/commands.h
index 395d23523372d2b69a6c8dc1cf336fea67a66821..42708c858d5d6e44fe45ca1388edf53f9af04d4d 100644
--- a/inc/lektor/commands.h
+++ b/inc/lektor/commands.h
@@ -48,8 +48,8 @@ bool command_plt_rename(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX])
bool command_plt_export(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX]);
bool command_plt_import(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX]);
bool command_plt_add (struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX]);
-bool command_plt_list (struct lkt_state *srv, size_t c, char *args[LKT_MESSAGE_ARGS_MAX], int cont);
-bool command_plt_ctx (struct lkt_state *srv, size_t c, char *args[LKT_MESSAGE_ARGS_MAX], int cont);
+bool command_plt_list (struct lkt_state *srv, size_t, char *args[LKT_MESSAGE_ARGS_MAX], int cont);
+bool command_plt_ctx (struct lkt_state *srv, size_t, char *args[LKT_MESSAGE_ARGS_MAX], int cont);
/* The help */
bool command_help(struct lkt_state *srv, size_t c, char *args[LKT_MESSAGE_ARGS_MAX]);
@@ -61,8 +61,8 @@ bool command_idle(struct lkt_state *srv, size_t c, struct lkt_command *cmd);
bool command_noidle(struct lkt_state *srv, size_t c);
/* Find and send karas in the db that match the search expression */
-bool command_find(struct lkt_state *srv, size_t c, char *cmd_args[LKT_MESSAGE_ARGS_MAX], long continuation,
- bool (*init)(volatile sqlite3 *, struct lkt_search *));
+bool command_find(struct lkt_state *srv, size_t c, char *cmd_args[LKT_MESSAGE_ARGS_MAX],
+ long continuation, bool (*init)(volatile sqlite3 *, struct lkt_search *));
/* Set options for the lektor such as `random`, `single`, `repeat`, etc */
enum lkt_playback_option {
@@ -74,7 +74,8 @@ enum lkt_playback_option {
lkt_playback_option_volume,
};
-bool command_set_playback_option(struct lkt_state *srv, size_t c, enum lkt_playback_option opt, char *args[LKT_MESSAGE_ARGS_MAX]);
+bool command_set_playback_option(struct lkt_state *srv, size_t c, enum lkt_playback_option opt,
+ char *args[LKT_MESSAGE_ARGS_MAX]);
/* Authentificate users */
bool command_password(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]);
diff --git a/inc/lektor/common.h b/inc/lektor/common.h
index 53d1729f0f7dbebd6ff269cde58bf99044402816..669884552f279562a5910dc4f0b9a7fdc98e5588 100644
--- a/inc/lektor/common.h
+++ b/inc/lektor/common.h
@@ -9,15 +9,15 @@
#define BUFFER_MAX 4096
#ifndef __GNUC__
-#define inline
+ #define inline
#endif
#ifndef MAX
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
+ #define MAX(a, b) ((a) < (b) ? (b) : (a))
#endif /* MAX */
#ifndef MIN
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
+ #define MIN(a, b) ((a) > (b) ? (b) : (a))
#endif /* MIN */
#define RETURN_IF(cond, msg, ret) \
diff --git a/inc/lektor/database.h b/inc/lektor/database.h
index c6c291fbbcc62390947edc9a95dd2d0a9522a96c..1c709d90f14bad6ccd2c65add613ebd80a1b0a06 100644
--- a/inc/lektor/database.h
+++ b/inc/lektor/database.h
@@ -49,7 +49,8 @@ bool database_get_kara_path(volatile sqlite3 *db, int id, char filepath[PATH_MAX
/* Update the database. */
bool database_update (volatile sqlite3 *db, const char *kara_dir, int check_timestamp);
-bool database_update_add (volatile sqlite3 *db, const char *kara_path, struct kara_metadata *mdt, uint64_t id, bool avail);
+bool database_update_add (volatile sqlite3 *db, const char *kara_path,
+ struct kara_metadata *mdt, uint64_t id, bool avail);
bool database_update_set_available(volatile sqlite3 *db, int id);
void database_update_del (volatile sqlite3 *db, int id);
void database_update_touch (volatile sqlite3 *db, int id);
@@ -80,7 +81,8 @@ struct lkt_callback {
};
/* List the content of the queue */
-bool database_queue_list(volatile sqlite3 *db, size_t from, size_t to, struct lkt_callback *callback);
+bool database_queue_list(volatile sqlite3 *db, size_t from, size_t to,
+ struct lkt_callback *callback);
/* Search the database */
struct lkt_search {
@@ -115,9 +117,12 @@ struct lkt_search {
};
typedef bool (*lkt_search_init_add_func) (volatile sqlite3 *, struct lkt_uri *, int);
-typedef bool (*lkt_search_database_func) (struct lkt_state *srv, size_t c, int id, int id_len, const char *row);
-typedef bool (*lkt_search_queue_func) (struct lkt_state *srv, size_t c, int id, int id_len, const char *row);
-typedef bool (*lkt_search_sticker_func) (struct lkt_state *srv, size_t c, const char *sticker, const char *type, int uri, int value);
+typedef bool (*lkt_search_database_func) (struct lkt_state *srv, size_t c, int id, int id_len,
+ const char *row);
+typedef bool (*lkt_search_queue_func) (struct lkt_state *srv, size_t c, int id, int id_len,
+ const char *row);
+typedef bool (*lkt_search_sticker_func) (struct lkt_state *srv, size_t c, const char *sticker,
+ const char *type, int uri, int value);
typedef bool (*lkt_search_listplaylist_func)(struct lkt_state *srv, size_t c, const char *name);
bool database_search_database_init (volatile sqlite3 *db, struct lkt_search *ret);
@@ -126,7 +131,8 @@ bool database_search_sticker_init (volatile sqlite3 *db, struct lkt_search *
bool database_search_playlist_init (volatile sqlite3 *db, struct lkt_search *ret);
bool database_search_listplaylist_init(volatile sqlite3 *db, struct lkt_search *ret);
bool database_search_iter(struct lkt_search *item);
-bool database_kara_by_id (volatile sqlite3 *db, int id, struct kara_metadata *kara, char filepath[PATH_MAX]);
+bool database_kara_by_id (volatile sqlite3 *db, int id, struct kara_metadata *kara,
+ char filepath[PATH_MAX]);
/* Next and prev operation on the queue. */
bool database_queue_next(volatile sqlite3 *db, char filepath[PATH_MAX]);
@@ -135,9 +141,13 @@ bool database_queue_skip_current(volatile sqlite3 *db, char filepath[PATH_MAX]);
/* Set a value in the config table */
bool database_validate_conf (volatile sqlite3 *db);
-bool database_config_set (volatile sqlite3 *db, const char *section, const char *key, const char *value);
-bool database_config_get_text(volatile sqlite3 *db, const char *section, const char *key, char *value, size_t len);
-bool database_config_get_int (volatile sqlite3 *db, const char *section, const char *key, int *value);
+bool database_config_set (volatile sqlite3 *db, const char *section, const char *key,
+ const char *value);
+bool database_config_get_text(volatile sqlite3 *db, const char *section, const char *key,
+ char *value,
+ size_t len);
+bool database_config_get_int (volatile sqlite3 *db, const char *section, const char *key,
+ int *value);
bool database_config_exists (volatile sqlite3 *db, const char *section, const char *key);
bool database_config_queue (volatile sqlite3 *db, const char *option, int value);
bool database_config_queue_default(volatile sqlite3 *db);
@@ -171,7 +181,10 @@ bool database_user_add(volatile sqlite3 *db, const char *username, const char *p
/* Stickers manipulations. */
bool database_sticker_create (volatile sqlite3 *db, const char *name);
bool database_sticker_delete (volatile sqlite3 *db, const char *name);
-bool database_sticker_delete_specify(volatile sqlite3 *sb, const char *type, int uri, const char *name);
-bool database_sticker_set (volatile sqlite3 *db, const char *type, const char *name, int uri, int value);
+bool database_sticker_delete_specify(volatile sqlite3 *sb, const char *type, int uri,
+ const char *name);
+bool database_sticker_set (volatile sqlite3 *db, const char *type, const char *name,
+ int uri,
+ int value);
#endif /* __LKT_DATABASE_H__ */
diff --git a/inc/lektor/reg.h b/inc/lektor/reg.h
index d1bb317d7d1a6ac3fa6bf94c833f655a9ea9927d..c2cc7494fd8e3cf18c3200f5d6722c29f75c7641 100644
--- a/inc/lektor/reg.h
+++ b/inc/lektor/reg.h
@@ -35,9 +35,9 @@ struct lkt_module {
/* Use only once per .so files or you will have some problems... */
#if ! defined(_STATIC_MODULES)
-#define REG_EXPORT(__reg) struct module_reg *__reg__ = __reg;
+ #define REG_EXPORT(__reg) struct module_reg *__reg__ = __reg;
#else
-#define REG_EXPORT(__reg)
+ #define REG_EXPORT(__reg)
#endif
/* Import a reg */
diff --git a/scripts/astyle.bash b/scripts/astyle.bash
index 1ec4735fcb2d4ad9eb216551d7a6920c2fa9c9d1..6b170988d9f704bfb5ac6e4441c2e81e893d4198 100755
--- a/scripts/astyle.bash
+++ b/scripts/astyle.bash
@@ -2,17 +2,20 @@
OPTIONS='
--style=linux -s4
- --pad-oper
- --pad-header
- --align-pointer=name
+ --pad-oper --pad-header --pad-comma
+ --align-pointer=name --align-reference=name
--break-one-line-headers
--remove-braces
--break-return-type
--convert-tabs
--close-templates
- --max-code-length=140
+ --max-code-length=101
--mode=c
--lineend=linux
+ --attach-inlines
+ --indent-labels
+ --indent-col1-comments
+ --indent-preproc-block
--quiet'
diff --git a/src/base/commands.c b/src/base/commands.c
index f23d55bb0655d298951a48cd977b9e81142bfc43..34652615d8eff782d3576ca1a8ad3efd683b7f0b 100644
--- a/src/base/commands.c
+++ b/src/base/commands.c
@@ -139,7 +139,7 @@ command_status(struct lkt_state *srv, size_t c,
const char *play_state;
RETURN_UNLESS(srv, "Invalid argument", false);
- RETURN_UNLESS(database_queue_state(srv->db, &queue_state), "Can't determine playback status", false);
+ RETURN_UNLESS(database_queue_state(srv->db, &queue_state), "Can't get playback status", false);
database_queue_current_kara(srv->db, NULL, &songid);
MOD_CALL(srv->window_mod, "get_elapsed", &elapsed);
MOD_CALL(srv->window_mod, "get_duration", &duration);
@@ -222,8 +222,7 @@ command_play(struct lkt_state *srv, char __attribute__((unused)) *args[LKT_MESSA
/* Do the actual job here. */
database_queue_stop(srv->db);
- RETURN_IF(MOD_CALL(srv->window_mod, "new", &srv->queue, srv->db),
- "Can't create window", false);
+ RETURN_IF(MOD_CALL(srv->window_mod, "new", &srv->queue, srv->db), "Can't create window", false);
srv->mpd_idle_events |= MPD_IDLE_PLAYER;
return __play_that_file(srv, pos);
}
@@ -251,8 +250,7 @@ command_playid(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX])
/* Do the work. */
database_queue_stop(srv->db);
srv->mpd_idle_events |= MPD_IDLE_PLAYER;
- RETURN_IF(MOD_CALL(srv->window_mod, "new", &srv->queue, srv->db),
- "Can't create window", false);
+ RETURN_IF(MOD_CALL(srv->window_mod, "new", &srv->queue, srv->db), "Can't create window", false);
database_queue_seekid(srv->db, (int) id, &pos);
return __play_that_file(srv, pos);
}
@@ -272,7 +270,7 @@ command_add(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX], int priorit
{
RETURN_UNLESS(args && args[0], "Invalid argument", false);
struct lkt_uri uri;
- int ret; /* To be modified according to the command (insert or add) later (TODO) */
+ int ret; /* To be modified according to the command (insert or add) later (TODO) */
RETURN_UNLESS(lkt_uri_from(&uri, args[0]), "Failed to parse query", false);
ret = database_queue_add_uri(srv->db, &uri, priority);
srv->mpd_idle_events |= MPD_IDLE_PLAYER;
@@ -361,7 +359,8 @@ 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();
@@ -427,7 +426,8 @@ lkt_callback_send_row_v1(void *_args, int pos_len, int pos, int id, int id_len,
struct lkt_callback *args = (struct lkt_callback *) _args;
struct lkt_message *out;
out = lkt_message_new();
- out->data_len = safe_snprintf(out->data, LKT_MESSAGE_MAX, "%*d: %*d %s\n", pos_len, pos, id_len, id, sql_row);
+ out->data_len = safe_snprintf(out->data, LKT_MESSAGE_MAX, "%*d: %*d %s\n",
+ pos_len, pos, id_len, id, sql_row);
lkt_state_send(args->srv, args->c, out);
return true;
}
@@ -554,8 +554,9 @@ command_plt_list(struct lkt_state *srv, size_t c,
return __iter_search(&search);
}
-bool command_plt_ctx(struct lkt_state *srv, size_t c,
- char *args[LKT_MESSAGE_ARGS_MAX], int cont)
+bool
+command_plt_ctx(struct lkt_state *srv, size_t c,
+ char *args[LKT_MESSAGE_ARGS_MAX], int cont)
{
struct lkt_search search = {
.srv = srv,
@@ -628,8 +629,10 @@ command_set_pos(struct lkt_state *srv, int index)
{
char filepath[PATH_MAX];
srv->mpd_idle_events |= MPD_IDLE_PLAYER;
- RETURN_UNLESS(database_queue_set_current_index(srv->db, index), "Failed to set position in queue", false);
- RETURN_UNLESS(database_queue_get_current_file(srv->db, filepath), "Failed to get filename", false);
+ RETURN_UNLESS(database_queue_set_current_index(srv->db, index),
+ "Failed to set position in queue", false);
+ RETURN_UNLESS(database_queue_get_current_file(srv->db, filepath),
+ "Failed to get filename", false);
return ! MOD_CALL(srv->window_mod, "load", filepath);
}
@@ -656,7 +659,7 @@ command_plt_add(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX])
}
ret = true;
-end_plt_add_uri:
+ end_plt_add_uri:
lkt_uri_free(&uri);
}
@@ -813,7 +816,7 @@ bool
command_password(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
{
RETURN_UNLESS(argv[0], "Invalid argument", false);
- RETURN_UNLESS(database_user_authentificate(srv->db, argv[0]), "Failed to authentificate user", false);
+ RETURN_UNLESS(database_user_authentificate(srv->db, argv[0]), "Failed to auth user", false);
lkt_client_auth(srv, c, true);
return true;
}
@@ -862,7 +865,8 @@ command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS
STRTOL(value, argv[3], endptr, err2);
RETURN_IF(err1 || err2, "STRTOL failed", false);
LOG_INFO("COMMAND", "Client %ld is using the sticker set command", c);
- RETURN_UNLESS(database_sticker_set(srv->db, argv[0], argv[2], uri, value), "Failed to get sticker", false);
+ RETURN_UNLESS(database_sticker_set(srv->db, argv[0], argv[2], uri, value),
+ "Can't get sticker", false);
srv->mpd_idle_events |= MPD_IDLE_STICKER;
return true;
}
diff --git a/src/database/find.c b/src/database/find.c
index 9e9a910d6b9211f0553e31750f021731b644fe7e..f9c6b0854f0ced8489916d8b41a38aa65c4ed154 100644
--- a/src/database/find.c
+++ b/src/database/find.c
@@ -240,7 +240,7 @@ database_search_iter(struct lkt_search *item)
case lkt_search_listplaylist:
sql_row = sqlite3_column_chars(item->stmt, 0); /* Name */
return ((lkt_search_listplaylist_func) item->call)
- (item->srv, item->c, sql_row);
+ (item->srv, item->c, sql_row);
default:
LOG_WARN("DB", "Search type %d is not implemented", item->type);
goto end;
diff --git a/src/database/queue.c b/src/database/queue.c
index 7e66079bacee086579dbb58b856f7521472fb5de..4cc78d6a3b427e2a129a2d45de1c879de4512e59 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <string.h>
+// *INDENT-OFF*
#define sqlite_just_exec(func, query) \
bool func (volatile sqlite3 *db) { \
SQLITE_EXEC(db, "BEGIN TRANSACTION;" query "COMMIT;", error); \
@@ -18,11 +19,10 @@
sqlite_just_exec(database_queue_toggle_pause, "UPDATE queue_state SET paused = 1 - paused;")
sqlite_just_exec(database_queue_crop, "DELETE FROM queue WHERE queue.kara_id <> (SELECT current FROM queue_state LIMIT 1);")
sqlite_just_exec(database_queue_stop, "UPDATE queue_state SET current = NULL;")
-sqlite_just_exec(database_queue_clear,
- "DELETE FROM queue;DELETE FROM sqlite_sequence WHERE name = 'queue';UPDATE queue_state SET current = NULL;")
-sqlite_just_exec(database_config_queue_default,
- "UPDATE queue_state SET volume = 100, paused = 1, random = 0, repeat = 0, single = 0, consume = 0, current = NULL, duration = 0;")
+sqlite_just_exec(database_queue_clear, "DELETE FROM queue;DELETE FROM sqlite_sequence WHERE name = 'queue';UPDATE queue_state SET current = NULL;")
+sqlite_just_exec(database_config_queue_default, "UPDATE queue_state SET volume = 100, paused = 1, random = 0, repeat = 0, single = 0, consume = 0, current = NULL, duration = 0;")
#undef sqlite_just_exec
+// *INDENT-ON*
bool
database_queue_set_paused(volatile sqlite3 *db, bool paused)
diff --git a/src/database/update.c b/src/database/update.c
index 7ece08ce1b03669e86783777ffe7870e19ce58f4..52bbda98d1d7771ba4f2a104d733108fa7bdbd87 100644
--- a/src/database/update.c
+++ b/src/database/update.c
@@ -18,15 +18,12 @@ __add_kara_to_update_job(volatile sqlite3 *db, size_t id)
{
static const char *SQL = NULL;
sqlite3_stmt *stmt;
- if (id)
- {
+ if (id) {
SQL = "INSERT INTO updates (job, kara_id) "
"SELECT MAX(update_job), ? FROM misc;";
SQLITE_PREPARE(db, stmt, SQL, error);
SQLITE_BIND_INT(db, stmt, 1, (int) id, error);
- }
- else
- {
+ } else {
SQL = "INSERT INTO updates (job, kara_id) "
"SELECT MAX(update_job), last_insert_rowid() FROM misc;";
SQLITE_PREPARE(db, stmt, SQL, error);
@@ -159,7 +156,8 @@ database_update_add(volatile sqlite3 *db, const char *kara_path,
(sqlite3_bind_int (stmt, 10, id) != SQLITE_OK) ||
(sqlite3_bind_int (stmt, 11, avail) != SQLITE_OK)
) {
- LOG_ERROR("DB", "Failed to bind argument for kara %s: %s", kara_path, sqlite3_errmsg((sqlite3 *) db));
+ LOG_ERROR("DB", "Failed to bind argument for kara %s: %s", kara_path,
+ sqlite3_errmsg((sqlite3 *) db));
goto error;
}
@@ -291,5 +289,6 @@ error:
error: return; \
}
sqlite_just_exec(database_stamp, "UPDATE misc SET last_update = strftime('%s','now');")
-sqlite_just_exec(database_updated, "UPDATE misc SET last_end_update = strftime('%s','now'), update_job = update_job + 1;")
+sqlite_just_exec(database_updated,
+ "UPDATE misc SET last_end_update = strftime('%s','now'), update_job = update_job + 1;")
#undef sqlite_just_exec
diff --git a/src/main/lkt.c b/src/main/lkt.c
index f69d2352b09c56475259d5e023e56e460002857b..b5d166511f636bdd1d4906bdd70580a0290791a1 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -731,7 +731,8 @@ plt_add__(struct cmd_args *args)
{
char buff[2];
FILE *sock = lkt_connect();
- fail_if(args->argc < 3, "Invalid argument, need at least three arguments: plt add <plt> <query>");
+ fail_if(args->argc < 3,
+ "Invalid argument, need at least three arguments: plt add <plt> <query>");
fail_if(!lkt_valid_type(args->argv[1]), "Invalid argument, type for the query is invalid");
int i;
@@ -917,7 +918,7 @@ search_get__(struct cmd_args *args)
exit(EXIT_SUCCESS);
else if (STR_NMATCH(buff, "ACK", 3))
exit(EXIT_FAILURE);
- UNUSED(write(1, buff, strlen(buff)));
+ UNUSED(write(1, buff, strlen(buff)));
}
}
@@ -1104,8 +1105,7 @@ main(int argc, const char **argv)
log_level = ERROR;
executable_name = "lkt";
assert(NULL != setlocale(LC_ALL, "en_US.UTF-8")); /* BECAUSE! */
- if (signal(SIGPIPE, sigpipe__))
- {
+ if (signal(SIGPIPE, sigpipe__)) {
// LOG_ERROR("SYS", "%s", "Failed to install handler for SIGPIPE signal");
}
diff --git a/src/main/server.c b/src/main/server.c
index e063a52e0bf3da9992b8f473626d177617d99345..02c87f1a913938672ffa0282359aa81487744359 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -19,8 +19,8 @@
#include <pthread.h>
#if defined (LKT_STATIC_MODULE)
-REG_DECLARE(sdl2_reg)
-REG_DECLARE(repo_reg)
+ 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 fde33df1d2c7c26da4240724b0b8885eba26ee4a..32632b5b53fb5a59b53893706d89875fcf15b017 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -70,7 +70,7 @@ struct __file {
static bool module_repo_new(struct module_repo_internal *, struct queue *, volatile sqlite3 *);
static void module_repo_close(struct module_repo_internal *);
static void module_repo_free(struct module_repo_internal *);
-__attribute__((unused)) static void module_repo_update(struct module_repo_internal *); /* Update all from kurisu */
+__attribute__((unused)) static void module_repo_update(struct module_repo_internal *);
/*********************
* Private functions *
@@ -337,5 +337,5 @@ REG_ADD_NAMED("close", mod_close)
REG_ADD_NAMED("update", mod_update)
REG_END()
#if ! defined (LKT_STATIC_MODULE)
-REG_EXPORT(repo_reg)
+ REG_EXPORT(repo_reg)
#endif
diff --git a/src/module/module_sdl2.c b/src/module/module_sdl2.c
index 1f007b097ba89a53c5f6066fd88a04e2945d2308..6b4d4e2460093f9b5d843758d5b2715ae1fec29d 100644
--- a/src/module/module_sdl2.c
+++ b/src/module/module_sdl2.c
@@ -240,7 +240,7 @@ REG_ADD_NAMED("get_duration", mod_get_duration)
REG_ADD_NAMED("get_elapsed", mod_get_elapsed)
REG_END()
#if ! defined (LKT_STATIC_MODULE)
-REG_EXPORT(sdl2_reg)
+ REG_EXPORT(sdl2_reg)
#endif
/***************************
diff --git a/src/module/repo.c b/src/module/repo.c
index 9ff55220bc551e234c50a3fa461693fa7fe62c9a..326d070680842689627b2151193687167f64c0e0 100644
--- a/src/module/repo.c
+++ b/src/module/repo.c
@@ -405,7 +405,7 @@ __handle_got_json(volatile sqlite3 *db, struct lkt_repo *repo,
kara.id, kara.filename);
continue;
}
-do_it:
+ do_it:
/* Reads the json */
err |= safe_json_get_string(kara_json, "song_name", kara.mdt.song_name, LEKTOR_TAG_MAX);
diff --git a/src/module/worker.c b/src/module/worker.c
index 3cdbf4fa143bd03aef0a6dddc5304d4437148b8f..be196bd7c4ae2f7e0e86df8c24ff5190d46e0af6 100644
--- a/src/module/worker.c
+++ b/src/module/worker.c
@@ -15,24 +15,18 @@ __worker_thread(void *__pool)
struct worker_pool *pool = (struct worker_pool *) __pool;
volatile void *volatile arg;
worker_function func;
- for (;;)
- {
+ for (;;) {
assert(!pthread_mutex_lock(&pool->lock));
- if (pool->len)
- {
+ if (pool->len) {
--(pool->len);
++(pool->thread_working);
func = pool->functions[pool->len];
arg = pool->args[pool->len];
- }
- else if (pool->exit)
- {
+ } else if (pool->exit) {
pthread_mutex_unlock(&pool->lock);
LOG_INFO("WORKER", "Exiting");
break;
- }
- else
- {
+ } else {
func = NULL;
pthread_mutex_unlock(&pool->lock);
sched_yield();
@@ -79,7 +73,8 @@ worker_pool_new(struct worker_pool *ret, size_t init_size, size_t thread_count)
return 0;
}
-void worker_pool_free(struct worker_pool *pool)
+void
+worker_pool_free(struct worker_pool *pool)
{
size_t i;
pool->exit = 1;
diff --git a/src/net/listen.c b/src/net/listen.c
index 2442adae1d54442dbbaedc819943ddaf837580d6..f5fc4493e6577c1b0f65a95e88245483adf88dbb 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -203,7 +203,9 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
err = ! command_find(srv, c, cmd.args, cmd.cont, database_search_queue_init);
else if (STR_MATCH(cmd.name, "sticker") && cmd.args[0]) {
- if (STR_MATCH(cmd.args[0], "get") || STR_MATCH(cmd.args[0], "list") || STR_MATCH(cmd.args[0], "find"))
+ if (STR_MATCH(cmd.args[0], "get") ||
+ STR_MATCH(cmd.args[0], "list") ||
+ STR_MATCH(cmd.args[0], "find"))
err = ! command_sticker_get(srv, c, &cmd.args[1]);
else if (STR_MATCH(cmd.args[0], "set"))
err = ! command_sticker_set(srv, c, &cmd.args[1]);
@@ -473,7 +475,7 @@ init_listening_socket(const char *host, const char *port)
break;
-failure:
+ failure:
close(fd);
fd = -1;
break;