diff --git a/inc/lektor/internal/os.h b/inc/lektor/internal/os.h
index bdea7fb94ac053bdd723c72545b8b753805406c1..d71239a3797f168b6e4e374d88b2d3e925104deb 100644
--- a/inc/lektor/internal/os.h
+++ b/inc/lektor/internal/os.h
@@ -88,16 +88,16 @@ enum {
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
typedef int SOCKET;
#define closesocket(fd) close(fd)
-#define INVALID_SOCKET (-1)
+#define INVALID_SOCKET (-1)
#else /* LKT_OS_WIN */
-#define SHUT_RDWR SD_BOTH
-#define close _close
-#define open _open
-#define fdopen _fdopen
-#define mkdir(str, perm) _mkdir(str)
+#define SHUT_RDWR SD_BOTH
+#define close _close
+#define open _open
+#define fdopen _fdopen
+#define mkdir(str, perm) _mkdir(str)
#define socket(dom, type, proto__) WSASocket(dom, type, 0, 0, 0, 0)
-#define get_nprocs_conf() 2
+#define get_nprocs_conf() 2
#endif
@@ -220,12 +220,12 @@ is_error_broken_pipe(int error)
}
#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
- PRIVATE_FUNCTION int
- poll(struct pollfd fds[], nfds_t nfds, int timeout)
- {
- return WSAPoll(fds, nfds, timeout);
- }
- #endif
+PRIVATE_FUNCTION int
+poll(struct pollfd fds[], nfds_t nfds, int timeout)
+{
+ return WSAPoll(fds, nfds, timeout);
+}
+#endif
#if defined(__cplusplus)
}
diff --git a/inc/lektor/net.h b/inc/lektor/net.h
index e503f9483068f3f9f4ce6579097ed6262b4d03e0..7a08be582ccf8bb6319fc46ae9273f1138d0ddad 100644
--- a/inc/lektor/net.h
+++ b/inc/lektor/net.h
@@ -53,13 +53,13 @@ void lkt_message_free(struct lkt_message *const msg);
int lkt_message_send(SOCKET fd, const struct lkt_message *const msg);
struct lkt_state {
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
/* The FDS, Windob' version */
fd_set *fds;
- #else
+#else
/* The FDS, toaster OS version */
struct pollfd *fds;
- #endif
+#endif
struct lkt_client *clients;
size_t fds_len;
diff --git a/src/base/cmd.c b/src/base/cmd.c
index 8d4460e559650a88e7dbbf6ef8a538f0699cfb17..34709f65f83bf7c1b76e14ad99e0ee6e9dd3613d 100644
--- a/src/base/cmd.c
+++ b/src/base/cmd.c
@@ -29,7 +29,7 @@ EXIT_FUNCTION
print_help(void)
{
#if defined(LKT_HAS_MAN) && (LKT_HAS_MAN == 1)
- if (!executable_name)
+ if (!executable_name)
exit(EXIT_FAILURE);
pid_t child_pid = fork();
diff --git a/src/base/config.c b/src/base/config.c
index 973916f84dfb799a2fee23baf7e3255f00cc4371..57a3f723730badaf100d2520ab49708d18212c96 100644
--- a/src/base/config.c
+++ b/src/base/config.c
@@ -211,12 +211,12 @@ config_default_file(char *dest, size_t len)
PRIVATE_FUNCTION int
config_detect_file(char *conf, size_t conf_len)
{
- bool is_malloc = false;
+ bool is_malloc = false;
char *home;
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
struct passwd *pw = getpwuid(getuid());
- #endif
+#endif
if (conf == NULL)
return 1;
@@ -224,7 +224,7 @@ config_detect_file(char *conf, size_t conf_len)
memset(conf, 0, conf_len * sizeof(char));
/* Try the current working dir config file. */
- if (getcwd(conf, (size_t)(conf_len) - 1) != NULL) {
+ if (getcwd(conf, (size_t)(conf_len)-1) != NULL) {
strncat(conf, "/lektor.ini", conf_len - 1);
LOG_INFO("CONFIG", "Trying %s", conf);
if (!access(conf, R_OK | F_OK))
@@ -242,10 +242,10 @@ config_detect_file(char *conf, size_t conf_len)
}
if (!home || (strlen(home) >= conf_len))
home = getenv("HOME");
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
if (!home || (strlen(home) >= conf_len))
home = pw->pw_dir;
- #endif
+#endif
if (!home || (strlen(home) >= conf_len))
goto no_config_directory;
memcpy(conf, home, (strlen(home) + 1) * sizeof(char));
diff --git a/src/base/launch.c b/src/base/launch.c
index cf6a28dbfaa8fb5e0658562a0a733cb7b93101df..48dff02c6774be6bdd35fee8a52df5a85bd224e4 100644
--- a/src/base/launch.c
+++ b/src/base/launch.c
@@ -63,8 +63,8 @@ resolve_appimage(void)
DESTRUCTOR_FUNCTION
___kill_klkt(void)
{
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
- RETURN_UNLESS(___klkt_pid, "No klkt child process to wait for", NOTHING)
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+ RETURN_UNLESS(___klkt_pid, "No klkt child process to wait for", NOTHING)
if (kill(___klkt_pid, SIGTERM) != 0) {
kill(___klkt_pid, SIGKILL);
@@ -90,7 +90,7 @@ ___kill_klkt(void)
: 0);
} while (!WIFEXITED(status) && !WIFSIGNALED(status));
- #endif
+#endif
return;
}
@@ -99,8 +99,8 @@ ___kill_klkt(void)
int
launch_ext_klkt(va_list UNUSED *___args)
{
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
- char exe_path[LKT_LINE_MAX];
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+ char exe_path[LKT_LINE_MAX];
char try_name[LKT_LINE_MAX];
const char *const appimage = getenv("APPIMAGE");
char *args[] = { "klkt", NULL };
@@ -173,7 +173,7 @@ end:
LOG_INFO("INIT", "Klkt launched with pid %ld", ___klkt_pid, try_name);
posix_spawn_file_actions_destroy(&action);
- #endif
+#endif
return 0;
}
diff --git a/src/base/logfile.c b/src/base/logfile.c
index d6f2bcd32bc2a133ed1e0ae6c6b1583b91d0c52b..a85decf1c0df7e49b41bb96d57d5f6997f4e0ddb 100644
--- a/src/base/logfile.c
+++ b/src/base/logfile.c
@@ -38,13 +38,13 @@ ___close_all_files(struct lkt_logfile *logfile)
{
if (logfile->current_fd > 0) {
#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
- //HANDLE handle = _get_osfhandle(logfile->current_fd); TODO: FIXME
+ //HANDLE handle = _get_osfhandle(logfile->current_fd); TODO: FIXME
//FlushFileBuffers(handle);
_close(logfile->current_fd);
#else
fsync(logfile->current_fd);
close(logfile->current_fd);
- #endif
+#endif
}
}
@@ -136,13 +136,13 @@ lkt_logfile_vfwrite(struct lkt_logfile *logfile, const char *line, va_list ap)
{
if (logfile->current_lines_in_file >= logfile->line_count)
___rotate_logfile(logfile);
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
FILE *f = _fdopen(logfile->current_fd, "a");
vfprintf(f, line, ap);
fclose(f);
- #else
- vdprintf(logfile->current_fd, line, ap);
- #endif
+#else
+ vdprintf(logfile->current_fd, line, ap);
+#endif
++(logfile->current_lines_in_file);
}
diff --git a/src/base/os.c b/src/base/os.c
index 6243ec6421651010f6ad699a95ed4fa58e2fe67e..404bc4a435a5b618d23d5d283d29fb8468cbbf70 100644
--- a/src/base/os.c
+++ b/src/base/os.c
@@ -13,12 +13,15 @@ int
lkt_read_self_exe(char *path, size_t len)
{
#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
- return !GetModuleFileName(NULL, path, (DWORD)len-1); // Error checking : https://stackoverflow.com/questions/9112893/how-to-get-path-to-executable-in-c-running-on-windows
- #else
+ return !GetModuleFileName(
+ NULL, path,
+ (DWORD)len -
+ 1); // Error checking : https://stackoverflow.com/questions/9112893/how-to-get-path-to-executable-in-c-running-on-windows
+#else
return !((readlink(SELF_EXECUTABLE_LINUX, path, len - 1) > 0) ||
(readlink(SELF_EXECUTABLE_FREEBSD, path, len - 1) > 0) ||
(readlink(SELF_EXECUTABLE_SOLARIS, path, len - 1) > 0));
- #endif
+#endif
}
void
@@ -44,7 +47,7 @@ lkt_thread_set_name(const char *name)
#pragma message(TODO "Add support for thread set name for the current OS")
LOG_ERROR("OS", "Unsuported operation 'thread_set_name' for OS");
#endif
- #endif /* defined(LKT_OS_WIN) && (LKT_OS_WIN == 1) */
+#endif /* defined(LKT_OS_WIN) && (LKT_OS_WIN == 1) */
}
/* Endian stuff */
diff --git a/src/base/segv.c b/src/base/segv.c
index fe38d59633c8492b9b7b7f96ff27a8319ad49043..476212b234caf7b3fb6d45d9e703401ae80adf45 100644
--- a/src/base/segv.c
+++ b/src/base/segv.c
@@ -18,7 +18,7 @@ ___segv_handler(int sig)
LOG_ERROR("SEGV", "Got signal %d", sig);
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
void *buffer[LKT_BACKLOG];
int nptrs = backtrace(buffer, LKT_BACKLOG);
@@ -32,7 +32,7 @@ ___segv_handler(int sig)
LOG_ERROR("SEGV", "[%2d] %s", j, strings[j]);
free(strings);
- #endif
+#endif
exit(EXIT_FAILURE);
}
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 0b5b06a14cb1d13de33e9dd0e5c56d750e7786a0..d1dafcf6311f5130f7cff4c9e09d2cb583f149db 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -43,17 +43,17 @@ static bool ___screen_detected = false;
CONSTRUCTOR_FUNCTION
setup_column_count(void)
{
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
CONSOLE_SCREEN_BUFFER_INFO csbi;
if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi))
- ___column_count = (unsigned int)(csbi.dwSize.X);
+ ___column_count = (unsigned int)(csbi.dwSize.X);
#else
struct winsize size;
if (0 == ioctl(STDOUT_FILENO, TIOCGWINSZ, &size)) {
___screen_detected = true;
___column_count = size.ws_col;
}
- #endif
+#endif
}
/* Row printer, should be queue/playlist/search agnostic, i.e. should handle
@@ -226,7 +226,7 @@ read_socket(SOCKET sock, char *buff, size_t max_len)
ssize_t len = 0;
memset(buff, 0, max_len * sizeof(char));
for (i = 0; i < max_len - 1; ++i) {
- len = recv(sock, buff+i, max_len, 0);
+ len = recv(sock, buff + i, max_len, 0);
if (buff[i] == '\n' || len != 1)
break;
}
@@ -250,7 +250,7 @@ create_socket(const char *host_arg, const char *port_arg)
struct sockaddr *ptr_sock;
socklen_t sock_len;
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
if (STR_NMATCH(port_arg, "unix", 4)) {
struct sockaddr_un sock;
@@ -265,25 +265,25 @@ create_socket(const char *host_arg, const char *port_arg)
/* TCP socket */
else {
- #endif
- struct addrinfo hints, *found;
- struct sockaddr sock;
+#endif
+ struct addrinfo hints, *found;
+ struct sockaddr sock;
- memset(&hints, 0, sizeof(struct addrinfo));
- hints.ai_flags = 0;
- hints.ai_family = AF_INET;
- hints.ai_socktype = SOCK_STREAM;
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_flags = 0;
+ hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_STREAM;
- if (getaddrinfo(host_arg, port_arg, &hints, &found) != 0 || (found == NULL))
- LOG_FATAL("getaddrinfo failed, this can be due to php "
- "invocation of lkt or an invalid hostname...");
+ if (getaddrinfo(host_arg, port_arg, &hints, &found) != 0 || (found == NULL))
+ LOG_FATAL("getaddrinfo failed, this can be due to php "
+ "invocation of lkt or an invalid hostname...");
- sock = *found->ai_addr;
- sock_len = found->ai_addrlen;
- freeaddrinfo(found);
+ sock = *found->ai_addr;
+ sock_len = found->ai_addrlen;
+ freeaddrinfo(found);
- ptr_sock = &sock;
- domain = AF_INET;
+ ptr_sock = &sock;
+ domain = AF_INET;
}
/* Common part */
@@ -350,7 +350,7 @@ send_cmd_with_uri(SOCKET sock, char *cmd, int argc, const char **argv)
PRIVATE_FUNCTION EXIT_FUNCTION func(struct cmd_args *args) \
{ \
FAIL_IF(args->argc != 2, "Need two arguments"); \
- SOCKET sock = lkt_connect(); \
+ SOCKET sock = lkt_connect(); \
char buff[2]; \
write_socket(sock, cmd " %s %s\n", args->argv[0], args->argv[1]); \
exit_with_status(sock, buff); \
@@ -365,7 +365,7 @@ just_send_two_args(queue_swapid__, "swapid");
PRIVATE_FUNCTION EXIT_FUNCTION func(struct cmd_args *args) \
{ \
FAIL_IF(args->argc != 1, "Invalid argument"); \
- SOCKET sock = lkt_connect(); \
+ SOCKET sock = lkt_connect(); \
char buff[2]; \
write_socket(sock, cmd " %s\n", args->argv[0]); \
exit_with_status(sock, buff); \
@@ -474,7 +474,7 @@ queue_replace__(struct cmd_args *args)
{
FAIL_IF(args->argc != 1, "Invalid argument");
char buff[LKT_MESSAGE_MAX];
- bool play = false;
+ bool play = false;
SOCKET sock = lkt_connect();
FOR_EVER
@@ -633,7 +633,7 @@ current__(struct cmd_args *args)
{
FAIL_IF(args->argc != 0, "Invalid argument, the current command takes no arguments");
static const char current_song__[] = "currentsong\n";
- SOCKET sock = lkt_connect();
+ SOCKET sock = lkt_connect();
write_socket(sock, current_song__);
read_kara_and_exit(sock);
}
@@ -807,7 +807,7 @@ queue_remove__(struct cmd_args *args)
static const char *cmd__ = "deleteid %d\n";
int dumy = 0;
- SOCKET sock = lkt_connect();
+ SOCKET sock = lkt_connect();
char buff[3];
sscanf(args->argv[0], "%d", &dumy);
@@ -826,7 +826,7 @@ queue_delete__(struct cmd_args *args)
static const char *cmd_id__ = "delete %d\n";
int dumy = 0;
- SOCKET sock = lkt_connect();
+ SOCKET sock = lkt_connect();
char buff[3];
sscanf(args->argv[0], "%d", &dumy);
@@ -1073,7 +1073,7 @@ ___continuation_calls(const char *cmd)
{
char buff[LKT_MESSAGE_MAX];
int continuation = 0;
- SOCKET sock = INVALID_SOCKET;
+ SOCKET sock = INVALID_SOCKET;
redo:
sock = lkt_connect();
@@ -1124,7 +1124,7 @@ search_with_cmd__(struct cmd_args *args, const char *cmd)
char buff[LKT_MESSAGE_MAX];
char regex[LKT_MESSAGE_MAX];
int continuation = 0;
- SOCKET sock = INVALID_SOCKET;
+ SOCKET sock = INVALID_SOCKET;
FAIL_IF(lkt_get_query_type(args, regex, LKT_MESSAGE_MAX), "Query is invalid");
@@ -1178,7 +1178,7 @@ search_plt__(struct cmd_args *args)
char buff[LKT_MESSAGE_MAX];
char regex[LKT_MESSAGE_MAX];
int continuation = 0;
- SOCKET sock = INVALID_SOCKET;
+ SOCKET sock = INVALID_SOCKET;
struct cmd_args args_regex = CMD_ARGS_NEXT(*args);
FAIL_IF(args->argc < 2, "Invalid number of arguments");
@@ -1376,10 +1376,10 @@ lkt_logfile_write(UNUSED struct lkt_logfile *logfile, UNUSED const char *line)
int
main(int argc, const char **argv)
{
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
WSADATA WSAData;
- WSAStartup(MAKEWORD(2,0), &WSAData);
- #endif
+ WSAStartup(MAKEWORD(2, 0), &WSAData);
+#endif
lkt_segv_quiet();
lkt_install_segv_handler();
@@ -1395,7 +1395,7 @@ main(int argc, const char **argv)
if (signal(SIGPIPE, sigpipe__))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
- #endif
+#endif
/* Parse */
cmd_parse_env(env_, &argc, &argv);
diff --git a/src/main/luka.c b/src/main/luka.c
index d88f0e2853de1025c4d5409e6319de1c9eb23362..59121785fe3b0b61850d06c01dea14aa38e6bcd1 100644
--- a/src/main/luka.c
+++ b/src/main/luka.c
@@ -465,7 +465,7 @@ main(const int argc, const char **argv)
if (signal(SIGPIPE, __sigpipe))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
- #endif
+#endif
cmd_parse(__options, argc - 1, argv + 1);
}
diff --git a/src/main/server.c b/src/main/server.c
index 695552673f0aa7adfae64cb29bd51b6b9be3b8f0..29df7c5311661d7c0b005458db20481999d32267 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -29,10 +29,10 @@ main(int argc, char *argv[])
{
lkt_install_segv_handler();
lkt_thread_set_name("lektord/daemon");
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
WSADATA WSAData;
- WSAStartup(MAKEWORD(2,0), &WSAData);
- #endif
+ WSAStartup(MAKEWORD(2, 0), &WSAData);
+#endif
REG_BEGIN(server_reg)
REG_ADD(launch_ext_klkt)
diff --git a/src/mkv/write.c b/src/mkv/write.c
index 02cffc70839ea8b76b688cabb854aa998ab33588..a8c6d324344c11d209362585fd6661ecfa4a7228 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -46,7 +46,7 @@
static bool
mkvpropedit__(const char *const args[])
{
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
pid_t pid;
int wstatus, status, fd;
@@ -93,10 +93,10 @@ mkvpropedit__(const char *const args[])
}
return true;
- #else
+#else
LOG_ERROR("MKV", "The call to mkvpropedit call is not implemented in windows");
return false;
- #endif
+#endif
}
int
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index f57e3847ce9d5912d1d94bec85214d79838b67a8..c7ac7043d86874f9832ef40eaca2676394fded7e 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -275,19 +275,19 @@ err:
PRIVATE_FUNCTION int
___download_kara(const char *url, const char *path, int override)
{
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
static const int open_flags_1 = O_WRONLY | O_APPEND | O_CREAT | O_EXCL;
static const int open_flags_2 = O_WRONLY | O_CREAT;
- #else
+#else
static const int open_flags_1 = O_WRONLY | O_APPEND | O_CREAT | O_EXCL | O_NOFOLLOW;
static const int open_flags_2 = O_WRONLY | O_CREAT | O_NOFOLLOW;
- #endif
+#endif
struct curl_slist *headers = NULL;
CURL *curl_handle;
CURLcode ret = 1;
errno = 0;
- int fd = open(path, open_flags_1, S_IRUSR | S_IWUSR);
+ int fd = open(path, open_flags_1, S_IRUSR | S_IWUSR);
retest:
if (fd < 0) {
diff --git a/src/module/worker.c b/src/module/worker.c
index bebd6c47af92e15a00da8aaea5a6f58f26f4baf0..533b02e46bf7bf8c7d639ee898181073218f3842 100644
--- a/src/module/worker.c
+++ b/src/module/worker.c
@@ -74,7 +74,7 @@ worker_pool_new(struct worker_pool *ret, size_t init_size, size_t thread_count)
{
if (!thread_count) {
//int nprocs = get_nprocs_conf();
- int nprocs = 2;
+ int nprocs = 2;
assert(nprocs > 0);
thread_count = (size_t)nprocs;
}
@@ -129,8 +129,10 @@ worker_pool_push(struct worker_pool *pool, worker_function func, void *arg)
if (pool->size < 1)
pool->size = 2;
size_t nsize = 2 * pool->size;
- void *new_func = safe_realloc((void *)pool->functions, (long unsigned int)(nsize * sizeof(worker_function)));
- void *new_args = safe_realloc((void *)pool->args, (long unsigned int)(nsize * sizeof(void *)));
+ void *new_func = safe_realloc((void *)pool->functions,
+ (long unsigned int)(nsize * sizeof(worker_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/net/listen.c b/src/net/listen.c
index 1d6dee87af98d6a29ed3411811fa9abe3d587861..92e64210182fc30b589f454aec8df4876fa3f4d7 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -503,14 +503,14 @@ init_permission_socket_unix(const char *file, unsigned int perms)
static inline int
__set_socket_flags(SOCKET fd)
{
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
u_long iMode = 1;
- int err = ioctlsocket(fd, (long int)FIONBIO, &iMode);
- if (err != 0){
+ int err = ioctlsocket(fd, (long int)FIONBIO, &iMode);
+ if (err != 0) {
LOG_ERROR("INIT", "Failed to set socket flag: %s", strerror(errno));
- goto failure;
+ goto failure;
}
- #else
+#else
int flags = fcntl(fd, F_GETFL, 0);
if (flags < 0) {
LOG_ERROR("INIT", "Failed to get socket flag: %s", strerror(errno));
@@ -521,7 +521,7 @@ __set_socket_flags(SOCKET fd)
LOG_ERROR("INIT", "Failed to set non-blocking flag: %s", strerror(errno));
goto failure;
}
- #endif
+#endif
return 0;
failure:
@@ -531,7 +531,7 @@ failure:
static int
init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* == "unix" */)
{
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
if (!STR_NMATCH(type, "unix", 4))
LOG_FATAL("Incorrect call to the function, 'port' is not set to 'unix'");
@@ -569,9 +569,9 @@ init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* =
}
return fd;
- #else
+#else
goto failure;
- #endif
+#endif
failure:
close(fd);
return -1;
@@ -580,10 +580,10 @@ failure:
static SOCKET
init_listening_socket_net(const char *host, const char *port)
{
- errno = 0;
- static const char yes = 1;
- SOCKET fd = INVALID_SOCKET;
- struct addrinfo hints = { 0 };
+ errno = 0;
+ static const char yes = 1;
+ SOCKET fd = INVALID_SOCKET;
+ struct addrinfo hints = { 0 };
struct addrinfo *available = NULL;
hints.ai_family = AF_UNSPEC;
@@ -642,7 +642,7 @@ init_listening_socket_net(const char *host, const char *port)
}
static int
-accept_all(SOCKET listen_fd, struct pollfd* fds, size_t fds_max, size_t *fds_len)
+accept_all(SOCKET listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
{
SOCKET fd;
struct sockaddr_in peer_addr;
@@ -666,15 +666,14 @@ accept_all(SOCKET listen_fd, struct pollfd* fds, size_t fds_max, size_t *fds_len
break;
}
-
- #if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
- u_long iMode = 1;
- int err = ioctlsocket(fd, (long int)FIONBIO, &iMode);
- if (err != 0){
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+ u_long iMode = 1;
+ int err = ioctlsocket(fd, (long int)FIONBIO, &iMode);
+ if (err != 0) {
perror("fcntl");
- break;
+ break;
}
- #else
+#else
const int flag = fcntl(fd, F_GETFL, 0);
if (flag < 0) {
perror("fcntl");
@@ -684,13 +683,13 @@ accept_all(SOCKET listen_fd, struct pollfd* fds, size_t fds_max, size_t *fds_len
perror("fcntl");
break;
}
- #endif
+#endif
const char *host = inet_ntoa(peer_addr.sin_addr);
const uint16_t port = htons(peer_addr.sin_port);
LOG_INFO("NETWORK", "New connection from %s:%d", host, port);
- fds->fd = fd;
+ fds->fd = fd;
fds->events = POLLIN;
fds++;
(*fds_len)++;
@@ -1070,11 +1069,11 @@ handle_signals(struct lkt_state *srv)
HANDLE(srv, INT)
HANDLE(srv, ILL)
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
HANDLE(srv, QUIT)
HANDLE(srv, USR1)
HANDLE(srv, USR2)
- #endif
+#endif
#undef HANDLE
}
@@ -1104,15 +1103,15 @@ lkt_listen(struct lkt_state *srv)
srv->___signal_ILL = ___lkt_handle_ILL;
signal(SIGINT, ___signal_handler);
signal(SIGILL, ___signal_handler);
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
signal(SIGUSR1, ___signal_handler);
signal(SIGUSR2, ___signal_handler);
signal(SIGQUIT, ___signal_handler);
- #endif
+#endif
LOG_INFO("INIT", "Signal handlers registered");
int is_unix_socket = STR_NMATCH(srv->port, "unix", 4);
- unsigned int perms = 0600;
+ unsigned int perms = 0600;
/* FIXME: Use the server register, and add a socket type (which is
* unix/tcp) and place the 'socket name' in a [server.socket] and not
@@ -1123,7 +1122,7 @@ lkt_listen(struct lkt_state *srv)
DBCONF_GET_OCTAL(srv->db, "server", "permission", &perms);
}
- const init_socket_func init_sock =
+ const init_socket_func init_sock =
is_unix_socket ? init_listening_socket_unix : init_listening_socket_net;
if ((srv->fds[0].fd = init_sock(srv->host, srv->port)) == INVALID_SOCKET)