--- lbbs/src/article_view_log.c 2025/11/04 14:58:56 1.17 +++ lbbs/src/article_view_log.c 2025/12/19 06:16:26 1.19 @@ -6,6 +6,10 @@ * Copyright (C) 2004-2025 Leaflet */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "article_view_log.h" #include "common.h" #include "database.h" @@ -24,7 +28,7 @@ int article_view_log_load(int uid, ARTIC if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -45,7 +49,7 @@ int article_view_log_load(int uid, ARTIC if ((db = db_open()) == NULL) { - log_error("article_view_log_load() error: Unable to open DB\n"); + log_error("article_view_log_load() error: Unable to open DB"); return -2; } @@ -55,12 +59,12 @@ int article_view_log_load(int uid, ARTIC uid); if (mysql_query(db, sql) != 0) { - log_error("Query view_article_log error: %s\n", mysql_error(db)); + log_error("Query view_article_log error: %s", mysql_error(db)); return -3; } if ((rs = mysql_store_result(db)) == NULL) { - log_error("Get view_article_log data failed\n"); + log_error("Get view_article_log data failed"); return -3; } @@ -68,7 +72,7 @@ int article_view_log_load(int uid, ARTIC p_view_log->aid_base = malloc(sizeof(int32_t) * mysql_num_rows(rs)); if (p_view_log->aid_base == NULL) { - log_error("malloc(INT32 * %d) error: OOM\n", mysql_num_rows(rs)); + log_error("malloc(INT32 * %d) error: OOM", mysql_num_rows(rs)); mysql_free_result(rs); mysql_close(db); return -4; @@ -82,7 +86,7 @@ int article_view_log_load(int uid, ARTIC mysql_close(db); - log_common("Loaded %d view_article_log records for uid=%d\n", p_view_log->aid_base_cnt, uid); + log_common("Loaded %d view_article_log records for uid=%d", p_view_log->aid_base_cnt, uid); if (!keep_inc) { @@ -96,7 +100,7 @@ int article_view_log_unload(ARTICLE_VIEW { if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -120,7 +124,7 @@ int article_view_log_save_inc(const ARTI if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -131,7 +135,7 @@ int article_view_log_save_inc(const ARTI if ((db = db_open()) == NULL) { - log_error("article_view_log_load() error: Unable to open DB\n"); + log_error("article_view_log_load() error: Unable to open DB"); return -2; } @@ -149,7 +153,7 @@ int article_view_log_save_inc(const ARTI { if (mysql_query(db, sql) != 0) { - log_error("Add view_article_log error: %s\n", mysql_error(db)); + log_error("Add view_article_log error: %s", mysql_error(db)); mysql_close(db); return -3; } @@ -165,7 +169,7 @@ int article_view_log_save_inc(const ARTI } } - log_common("Saved %d view_article_log records for uid=%d\n", affected_record, p_view_log->uid); + log_common("Saved %d view_article_log records for uid=%d", affected_record, p_view_log->uid); mysql_close(db); @@ -181,7 +185,7 @@ int article_view_log_merge_inc(ARTICLE_V if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -195,7 +199,7 @@ int article_view_log_merge_inc(ARTICLE_V aid_new = malloc(sizeof(int32_t) * (size_t)aid_new_cnt); if (aid_new == NULL) { - log_error("malloc(INT32 * %d) error: OOM\n", aid_new_cnt); + log_error("malloc(INT32 * %d) error: OOM", aid_new_cnt); return -2; } @@ -205,7 +209,7 @@ int article_view_log_merge_inc(ARTICLE_V { if (p_view_log->aid_base[i] == p_view_log->aid_inc[j]) { - log_error("Duplicate aid = %d found in both Base (offset = %d) and Inc (offset = %d)\n", + log_error("Duplicate aid = %d found in both Base (offset = %d) and Inc (offset = %d)", p_view_log->aid_base[i], i, j); j++; // Skip duplicate one in Inc } @@ -251,7 +255,7 @@ int article_view_log_is_viewed(int32_t a if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -300,7 +304,7 @@ int article_view_log_set_viewed(int32_t if (p_view_log == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -343,7 +347,7 @@ int article_view_log_set_viewed(int32_t // Save incremental article view log if (article_view_log_save_inc(p_view_log) < 0) { - log_error("article_view_log_save_inc() error\n"); + log_error("article_view_log_save_inc() error"); return -2; }