--- lbbs/src/article_view_log.c 2025/06/16 14:30:44 1.5 +++ lbbs/src/article_view_log.c 2025/10/14 13:28:28 1.11 @@ -14,13 +14,10 @@ * * ***************************************************************************/ -#define _XOPEN_SOURCE 500 -#define _POSIX_C_SOURCE 200809L - #include "article_view_log.h" -#include "log.h" #include "common.h" #include "database.h" +#include "log.h" #include #include @@ -35,7 +32,7 @@ int article_view_log_load(int uid, ARTIC if (p_view_log == NULL) { - log_error("article_view_log_load() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } @@ -107,7 +104,7 @@ int article_view_log_unload(ARTICLE_VIEW { if (p_view_log == NULL) { - log_error("article_view_log_unload() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } @@ -131,11 +128,11 @@ int article_view_log_save_inc(const ARTI if (p_view_log == NULL) { - log_error("article_view_log_save_inc() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } - if (p_view_log->uid <= 0) + if (p_view_log->uid <= 0 || p_view_log->aid_inc_cnt == 0) { return 0; } @@ -191,7 +188,7 @@ int article_view_log_merge_inc(ARTICLE_V if (p_view_log == NULL) { - log_error("article_view_log_merge_inc() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } @@ -251,7 +248,7 @@ int article_view_log_is_viewed(int32_t a if (p_view_log == NULL) { - log_error("article_view_log_is_viewed() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } @@ -300,7 +297,7 @@ int article_view_log_set_viewed(int32_t if (p_view_log == NULL) { - log_error("article_view_log_set_viewed() error: NULL pointer\n"); + log_error("NULL pointer error\n"); return -1; } @@ -338,7 +335,7 @@ int article_view_log_set_viewed(int32_t } // Merge if Inc is full - if (p_view_log->aid_inc_cnt >= MAX_AID_INC_CNT) + if (p_view_log->aid_inc_cnt >= MAX_VIEWED_AID_INC_CNT) { // Save incremental article view log if (article_view_log_save_inc(p_view_log) < 0) @@ -363,10 +360,12 @@ int article_view_log_set_viewed(int32_t right = left + 1; } - for (i = p_view_log->aid_inc_cnt - 1; i >= right; i--) - { - p_view_log->aid_inc[i + 1] = p_view_log->aid_inc[i]; - } + // for (i = p_view_log->aid_inc_cnt - 1; i >= right; i--) + // { + // p_view_log->aid_inc[i + 1] = p_view_log->aid_inc[i]; + // } + memmove(p_view_log->aid_inc + right + 1, p_view_log->aid_inc + right, + sizeof(int32_t) * (size_t)(p_view_log->aid_inc_cnt - right)); p_view_log->aid_inc[right] = aid; (p_view_log->aid_inc_cnt)++;