From 21f6201e4801cdec5a401578845fe3c300ec8024 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 9 May 2020 14:21:41 +0200
Subject: [PATCH] Small corrections
---
src/database/stickers.c | 41 ++++++++++++++++++++---------------------
src/module/mpv.c | 2 +-
src/net/listen.c | 4 ++--
3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/database/stickers.c b/src/database/stickers.c
index b87991e2..223a9ac9 100644
--- a/src/database/stickers.c
+++ b/src/database/stickers.c
@@ -7,6 +7,12 @@
#include <stdlib.h>
#include <stdio.h>
+static inline int
+__check_type(const char *type)
+{
+ return ! ( STR_MATCH(type, "kara") || STR_MATCH(type, "plt") );
+}
+
bool
database_sticker_create(volatile sqlite3 *db, const char *name)
{
@@ -47,33 +53,28 @@ error:
bool
database_sticker_set(volatile sqlite3 *db, const char *type, const char *name, int uri, int value)
{
- const char *SQL = NULL;
+ static const char *SQL_TEMPLATE =
+ "INSERT OR REPLACE INTO 'stickers.%s' (id, sticker, value) "
+ "SELECT ?, 'stickers'.id, ? "
+ "FROM 'stickers' "
+ "WHERE 'stickers'.name = ?;";
+ char SQL[LKT_MAX_SQLITE_STATEMENT];
sqlite3_stmt *stmt;
int ret = false;
+ if (__check_type(type)) {
+ LOG_ERROR_SCT("DB", "Type '%s' is invalid", type);
+ return false;
+ }
+
+ safe_snprintf(SQL, LKT_MAX_SQLITE_STATEMENT, SQL_TEMPLATE, type);
+
/* Bindings:
* 1 -> the uri of the plalist or kara
* 2 -> the value of the sticker
* 3 -> the name of the sticker
*/
- if (!strcasecmp(type, "kara"))
- SQL =
- "INSERT OR REPLACE INTO 'stickers.kara' (id, sticker, value) "
- "SELECT ?, 'stickers'.id, ? "
- "FROM 'stickers' "
- "WHERE 'stickers'.name = ?;";
- else if (!strcasecmp(type, "plt"))
- SQL =
- "INSERT OR REPLACE INTO 'stickers.plt' (id, sticker, value) "
- "SELECT ?, 'stickers'.id, ? "
- "FROM 'stickers' "
- "WHERE 'stickers'.name = ?;";
- else {
- LOG_ERROR_SCT("DB", "Type '%s' is invalid", type);
- return false;
- }
-
SQLITE_PREPARE(db, stmt, SQL, error);
SQLITE_BIND_INT(db, stmt, 1, uri, error);
SQLITE_BIND_INT(db, stmt, 2, value, error);
@@ -91,9 +92,7 @@ database_sticker_delete_specify(volatile sqlite3 *db, const char *type, int uri,
char SQL[LKT_MAX_SQLITE_STATEMENT];
sqlite3_stmt *stmt;
int ret = false;
-
- /* Base query. */
- if (strcasecmp("plt", type) && strcasecmp("kara", type)) {
+ if (__check_type(type)) {
LOG_ERROR_SCT("DB", "Type '%s' is invalid", type);
return false;
}
diff --git a/src/module/mpv.c b/src/module/mpv.c
index 3c2e4552..f1b891cb 100644
--- a/src/module/mpv.c
+++ b/src/module/mpv.c
@@ -75,7 +75,7 @@ lmpv_new(unsigned long int wid)
goto error;
}
- LOG_ERROR_SCT("WINDOW", "%s", "Create mpv context");
+ LOG_INFO_SCT("WINDOW", "%s", "Create mpv context");
return ctx;
error:
lmpv_free(&ctx);
diff --git a/src/net/listen.c b/src/net/listen.c
index e52a2eca..5f50167b 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -523,7 +523,7 @@ accept_all(int listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
char *host = inet_ntoa(peer_addr.sin_addr);
uint16_t port = htons(peer_addr.sin_port);
- printf(" * New connection from %s:%d.\n", host, port);
+ LOG_WARN_SCT("NETWORK", "New connection from %s:%d", host, port);
fds->fd = fd;
fds->events = POLLIN;
@@ -597,7 +597,7 @@ handle_network_events(struct lkt_state *srv)
if (srv->fds[i].fd > 0)
continue;
- printf(" * Connection closed.\n");
+ LOG_WARN_SCT("NETWORK", "Connection closed by client %ld", i);
srv->fds[i] = srv->fds[srv->fds_len - 1];
srv->clients[i - 1] = srv->clients[srv->fds_len - 2];
srv->fds_len--;
--
GitLab