diff --git a/inc/lektor/internal/os.h b/inc/lektor/internal/os.h
index dc7b1e5a8af46052a2b99be8911b69bbfb7b94f0..0b49f8c33523a07f95e35cc6f22b214ddc6728bd 100644
--- a/inc/lektor/internal/os.h
+++ b/inc/lektor/internal/os.h
@@ -90,12 +90,12 @@ enum {
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
/* LKT_OS_TOASTER | APPLE */
typedef int SOCKET;
-#define closesocket(fd) close(fd)
-#define INVALID_SOCKET ((SOCKET)(-1))
-#define to_file_mode_t(perm) ((unsigned int)(perm))
-#define to_size_t(size) ((size_t)(size))
-#define to_int_t(size) ((size_t)(size))
-#define to_socket_len_t(size) ((socklen_t)(size))
+#define closesocket(fd) close(fd)
+#define INVALID_SOCKET ((SOCKET)(-1))
+#define to_file_mode_t(perm) ((unsigned int)(perm))
+#define to_size_t(size) ((size_t)(size))
+#define to_int_t(size) ((size_t)(size))
+#define to_socket_len_t(size) ((socklen_t)(size))
#else
/* LKT_OS_WIN */
@@ -107,8 +107,8 @@ typedef int SOCKET;
#define socket(dom, type, proto__) WSASocket(dom, type, 0, 0, 0, 0)
#define get_nprocs_conf() 2
#define to_file_mode_t(perm) ((int)(perm))
-#define to_size_t(size) ((ULONG)(size))
-#define to_int_t(size) ((int)(size))
+#define to_size_t(size) ((ULONG)(size))
+#define to_int_t(size) ((int)(size))
#define to_socket_len_t(size) ((int)(size))
#endif
diff --git a/inc/lektor/internal/worker.h b/inc/lektor/internal/worker.h
index 6c05933d1c27810739810f61abcaba4063cef92a..75ec2199bd063d8110e9abc25ebf037afdf6c5a8 100644
--- a/inc/lektor/internal/worker.h
+++ b/inc/lektor/internal/worker.h
@@ -184,8 +184,10 @@ worker_pool_push(struct worker_pool *pool, worker_pool_function func, void *arg)
pool->size = 2;
size_t nsize = 2 * pool->size;
void *new_func =
- safe_realloc((void *)pool->functions, (long unsigned int)nsize * sizeof(worker_pool_function));
- void *new_args = safe_realloc((void *)pool->args, (long unsigned int)nsize * sizeof(void *));
+ safe_realloc((void *)pool->functions,
+ (long unsigned int)nsize * sizeof(worker_pool_function));
+ void *new_args =
+ safe_realloc((void *)pool->args, (long unsigned int)nsize * sizeof(void *));
pool->size *= 2;
pool->functions = new_func;
diff --git a/src/base/config.c b/src/base/config.c
index cddcdd1c4b210e59acfdb726c4dd46791b33b3a0..93998c938544008f42c422d40e0121d3b8232a20 100644
--- a/src/base/config.c
+++ b/src/base/config.c
@@ -225,7 +225,7 @@ config_detect_file(char *conf, size_t conf_len)
/* Try the current working dir config file. */
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
- if (getcwd(conf, to_size_t(conf_len)-1) != NULL) {
+ if (getcwd(conf, to_size_t(conf_len) - 1) != NULL) {
#else
if (getcwd(conf, (int)(conf_len)-1) != NULL) {
#endif
diff --git a/src/base/launch.c b/src/base/launch.c
index 6f18d0e738d375694fb953ce0fc715ef61bdbb70..67b152fd898f630909b9e14c3350b945f383229d 100644
--- a/src/base/launch.c
+++ b/src/base/launch.c
@@ -15,7 +15,7 @@ extern char **environ;
/* Private implementation details */
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
-static pid_t ___klkt_pid = 0;
+static pid_t ___klkt_pid = 0;
#endif
static int ___is_appimage = 0;
diff --git a/src/main/lkt.c b/src/main/lkt.c
index f7eb79266ef39665affb337273a4aed9e9e4f065..5e515044e2c6a366f74c5a1ebf76392750cbfb2a 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -1388,12 +1388,15 @@ main(int argc, const char **argv)
lkt_set_log_level(LOG_LEVEL_INFO);
cmd_set_executable_name("lkt");
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
/* Enforce some locals */
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
if (signal(SIGPIPE, sigpipe__))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
diff --git a/src/main/luka.c b/src/main/luka.c
index 59121785fe3b0b61850d06c01dea14aa38e6bcd1..1e075ab67f7081d317ff74205f7122f853a30c8a 100644
--- a/src/main/luka.c
+++ b/src/main/luka.c
@@ -456,12 +456,15 @@ main(const int argc, const char **argv)
lkt_segv_quiet();
lkt_install_segv_handler();
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
/* Enforce some locals */
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
if (signal(SIGPIPE, __sigpipe))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
diff --git a/src/main/server.c b/src/main/server.c
index 29df7c5311661d7c0b005458db20481999d32267..052f45d602f3f1cca999d704e07763ba7eefa5da 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -45,13 +45,16 @@ main(int argc, char *argv[])
#endif
REG_END()
- /* Enforce some locals */
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+/* Enforce some locals */
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
- #endif
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
+#endif
int autoclear;
int opt;
diff --git a/src/mkv/write.c b/src/mkv/write.c
index 0c5f80673ed5d2cdd91b0954faf858e93628817b..844fb5fe09e606e8551955354d982f748ccab2e9 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -96,7 +96,7 @@ mkvpropedit__(const char *const args[])
}
#else
static bool
-mkvpropedit__(char* command)
+mkvpropedit__(char *command)
{
bool sta = false;
STARTUPINFO si;
@@ -105,20 +105,8 @@ mkvpropedit__(char* command)
si.cb = sizeof(si);
ZeroMemory(&pi, sizeof(pi));
- if (!CreateProcessA(
- NULL,
- command,
- NULL,
- NULL,
- FALSE,
- 0,
- NULL,
- NULL,
- &si,
- &pi
- )
- ){
- DWORD err = GetLastError();
+ if (!CreateProcessA(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+ DWORD err = GetLastError();
LOG_ERROR("FORK", "Failed to create process: error %d", err);
return false;
}
@@ -126,21 +114,18 @@ mkvpropedit__(char* command)
WaitForSingleObject(pi.hProcess, INFINITE);
DWORD exitCode;
- if (GetExitCodeProcess(pi.hProcess, &exitCode)){
- if (exitCode == 0)
- goto success;
- if (exitCode == 2)
- LOG_ERROR(
- "FORK",
- "Status 2 with mkvpropedit could means that karas are not valid MKV files");
+ if (GetExitCodeProcess(pi.hProcess, &exitCode)) {
+ if (exitCode == 0)
+ goto success;
+ if (exitCode == 2)
+ LOG_ERROR("FORK",
+ "Status 2 with mkvpropedit could means that karas are not valid MKV files");
else if (exitCode == 1)
- LOG_WARN("FORK",
- "Status 1 on mkvpropedit means that it generated some warnings...");
+ LOG_WARN("FORK", "Status 1 on mkvpropedit means that it generated some warnings...");
} else {
- LOG_ERROR(
- "FORK",
- "Can't get exit code of created process: something probably went wrong...");
- goto error;
+ LOG_ERROR("FORK",
+ "Can't get exit code of created process: something probably went wrong...");
+ goto error;
}
success:
@@ -176,19 +161,18 @@ kara_metadata_write(struct kara_metadata *mdt, const char *filename)
}
#else
DWORD err = GetTempPathA(PATH_MAX, tmpfilepath);
- if (err == 0 || err > MAX_PATH){
+ if (err == 0 || err > MAX_PATH) {
LOG_ERROR("MKV", "Failed to get tmp directory");
goto error;
}
- FILE* handle;
+ FILE *handle;
char metadafilepath[PATH_MAX] = "lektor.metadata.XXXXXX";
- if (_mktemp_s(metadafilepath, PATH_MAX))
- {
+ if (_mktemp_s(metadafilepath, PATH_MAX)) {
LOG_ERROR("MKV", "Failed to create temporary filename");
goto error;
}
strncat(tmpfilepath, metadafilepath, PATH_MAX - 1);
- if (fopen_s(&handle, tmpfilepath, "w")){
+ if (fopen_s(&handle, tmpfilepath, "w")) {
LOG_ERROR("MKV", "Failed to create temporary file %s", metadafilepath);
goto error;
}
@@ -200,13 +184,13 @@ kara_metadata_write(struct kara_metadata *mdt, const char *filename)
#endif
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
- const char *args1[] = { "mkvpropedit", "-t", "all:", filename, NULL };
- const char *args2[] = { "mkvpropedit", "-t", tmpfilepath, filename, NULL };
+ const char *args1[] = { "mkvpropedit", "-t", "all:", filename, NULL };
+ const char *args2[] = { "mkvpropedit", "-t", tmpfilepath, filename, NULL };
if (!mkvpropedit__(args1) || !mkvpropedit__(args2))
#else
- char cmd1[MAX_PATH] = "mkvpropedit -t all: ";
- char cmd2[MAX_PATH] = "mkvpropedit -t ";
- size_t filenameLen = strlen(filename);
+ char cmd1[MAX_PATH] = "mkvpropedit -t all: ";
+ char cmd2[MAX_PATH] = "mkvpropedit -t ";
+ size_t filenameLen = strlen(filename);
size_t tmpfilepathLen = strlen(tmpfilepath);
strncat(cmd1, filename, MAX_PATH - 23 - filenameLen);
strncat(cmd2, tmpfilepath, MAX_PATH - 19 - tmpfilepathLen);
diff --git a/src/module/module_qt_window.cc b/src/module/module_qt_window.cc
index 20794c08563792d60635aec777ea105c155df2b0..69a14b7b32b11a40814ff084509553f2cd442b48 100644
--- a/src/module/module_qt_window.cc
+++ b/src/module/module_qt_window.cc
@@ -30,11 +30,10 @@ mod_new(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- queue *queue = va_arg(copy, struct queue *);
- lkt_db *db = va_arg(copy, lkt_db *);
- bool ret = module_qt_window_new(win, queue, db);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ queue *queue = va_arg(copy, struct queue *);
+ lkt_db *db = va_arg(copy, lkt_db *);
+ bool ret = module_qt_window_new(win, queue, db);
va_end(copy);
return !ret;
}
@@ -44,8 +43,7 @@ mod_close(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_close(*win);
va_end(copy);
return 0;
@@ -56,8 +54,7 @@ mod_free(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_free(*win);
va_end(copy);
return 0;
@@ -68,9 +65,8 @@ mod_toggle_pause(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- bool ret = (*win)->mpv_widget->toggle_pause();
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ bool ret = (*win)->mpv_widget->toggle_pause();
va_end(copy);
return !ret;
}
@@ -80,10 +76,9 @@ mod_load_file(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const char *file = va_arg(copy, const char *);
- const bool ret = (*win)->mpv_widget->load_file(file);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const char *file = va_arg(copy, const char *);
+ const bool ret = (*win)->mpv_widget->load_file(file);
va_end(copy);
return !ret;
}
@@ -93,10 +88,9 @@ mod_set_volume(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int volume = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_volume(volume);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int volume = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_volume(volume);
va_end(copy);
return !ret;
}
@@ -106,10 +100,9 @@ mod_set_paused(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int state = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_paused(state);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int state = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_paused(state);
va_end(copy);
return !ret;
}
@@ -119,10 +112,9 @@ mod_set_position(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int seconds = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_position(seconds);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int seconds = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_position(seconds);
va_end(copy);
return !ret;
}
@@ -132,10 +124,9 @@ mod_get_duration(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- int *duration = va_arg(copy, int *);
- bool ret = (*win)->mpv_widget->get_duration(duration);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ int *duration = va_arg(copy, int *);
+ bool ret = (*win)->mpv_widget->get_duration(duration);
va_end(copy);
return !ret;
}
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index dba6bc007647f4d0f3e6ef3b89f13c90609df702..c3ab462346d99ae63239191b93bc7dc6768c6f70 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -211,7 +211,8 @@ ___write_disk(char *data, size_t size, size_t nmem, void *user)
{
size_t realsize = size * nmem;
struct ___file *file = (struct ___file *)user;
- RETURN_IF(write(file->fd, data, (unsigned int)realsize) != (ssize_t)realsize, "Failed to write", 0);
+ RETURN_IF(write(file->fd, data, (unsigned int)realsize) != (ssize_t)realsize, "Failed to write",
+ 0);
if (file->index < 4) {
memcpy(file->magic + file->index, data, 4 - file->index);
@@ -593,7 +594,6 @@ setup_kara_struct(struct module_repo_internal *repo, bool dry_update, struct lkt
}
#endif
-
return kara;
}
diff --git a/src/module/qt_window/mpvwidget.cc b/src/module/qt_window/mpvwidget.cc
index 7024f133bd3eb24674f61ce374b5359d0e459b39..e7140409c3a66606989f4faa08fd61e3900e3c49 100644
--- a/src/module/qt_window/mpvwidget.cc
+++ b/src/module/qt_window/mpvwidget.cc
@@ -28,8 +28,7 @@ get_proc_address(void *ctx, const char *name)
return reinterpret_cast<void *>(glctx->getProcAddress(QByteArray(name)));
}
-MpvWidget::MpvWidget(queue *queue, lkt_db *db, module_reg *reg, bool *launched,
- QWidget *parent)
+MpvWidget::MpvWidget(queue *queue, lkt_db *db, module_reg *reg, bool *launched, QWidget *parent)
: QOpenGLWidget(parent)
, m_queue(queue)
, m_db(db)
diff --git a/src/net/listen.c b/src/net/listen.c
index d6a23ea60d19b509a87abb8b6c13dc05c4a4426b..edaa7474ee7311cfa7b0dfa1ef0969dc853bd835 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -405,9 +405,8 @@ handle_incoming_data(struct lkt_state *srv, size_t i)
for (;;) {
/* Recieve some data. */
- const ssize_t n =
- recv(srv->fds[i].fd, cli->buffer_in + cli->buffer_in_len,
- to_int_t(LKT_MESSAGE_MAX - cli->buffer_in_len), 0);
+ const ssize_t n = recv(srv->fds[i].fd, cli->buffer_in + cli->buffer_in_len,
+ to_int_t(LKT_MESSAGE_MAX - cli->buffer_in_len), 0);
if (n < 0) {
if (is_error_would_block(get_last_error()))
@@ -1001,8 +1000,8 @@ redo:
* Signal handlers *
*******************/
-static int ___lkt_signal_INT = 0; /* SIGINT => close the server */
-static int ___lkt_signal_ILL = 0; /* SIGILL => NoT veRy HappY */
+static int ___lkt_signal_INT = 0; /* SIGINT => close the server */
+static int ___lkt_signal_ILL = 0; /* SIGILL => NoT veRy HappY */
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
static int ___lkt_signal_QUIT = 0; /* SIGQUIT => close the server */
static int ___lkt_signal_USR1 = 0; /* SIGUSR1 => not used */