--- lbbs/src/article_view_log.c	2025/06/21 02:15:18	1.7
+++ lbbs/src/article_view_log.c	2025/11/04 14:58:56	1.17
@@ -1,18 +1,10 @@
-/***************************************************************************
-					 article_view_log.c  -  description
-							 -------------------
-	Copyright            : (C) 2004-2025 by Leaflet
-	Email                : leaflet@leafok.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 3 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * article_view_log
+ *   - data persistence and query of article view log
+ *
+ * Copyright (C) 2004-2025  Leaflet <leaflet@leafok.com>
+ */
 
 #include "article_view_log.h"
 #include "common.h"
@@ -32,7 +24,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;
 	}
 
@@ -104,7 +96,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;
 	}
 
@@ -128,11 +120,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;
 	}
@@ -185,10 +177,11 @@ int article_view_log_merge_inc(ARTICLE_V
 	int32_t *aid_new;
 	int aid_new_cnt;
 	int i, j, k;
+	int len;
 
 	if (p_view_log == NULL)
 	{
-		log_error("article_view_log_merge_inc() error: NULL pointer\n");
+		log_error("NULL pointer error\n");
 		return -1;
 	}
 
@@ -225,10 +218,20 @@ int article_view_log_merge_inc(ARTICLE_V
 		}
 	}
 
-	memcpy(aid_new + k, p_view_log->aid_base + i, sizeof(int32_t) * (size_t)(p_view_log->aid_base_cnt - i));
-	k += (p_view_log->aid_base_cnt - i);
-	memcpy(aid_new + k, p_view_log->aid_inc + j, sizeof(int32_t) * (size_t)(p_view_log->aid_inc_cnt - j));
-	k += (p_view_log->aid_inc_cnt - j);
+	len = p_view_log->aid_base_cnt - i;
+	if (len > 0)
+	{
+		memcpy(aid_new + k, p_view_log->aid_base + i,
+			   sizeof(int32_t) * (size_t)len);
+		k += len;
+	}
+	len = p_view_log->aid_inc_cnt - j;
+	if (len > 0)
+	{
+		memcpy(aid_new + k, p_view_log->aid_inc + j,
+			   sizeof(int32_t) * (size_t)len);
+		k += len;
+	}
 
 	free(p_view_log->aid_base);
 	p_view_log->aid_base = aid_new;
@@ -248,7 +251,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;
 	}
 
@@ -267,7 +270,7 @@ int article_view_log_is_viewed(int32_t a
 			mid = (left + right) / 2;
 			if (aid < (i == 0 ? p_view_log->aid_base[mid] : p_view_log->aid_inc[mid]))
 			{
-				right = mid;
+				right = mid - 1;
 			}
 			else if (aid > (i == 0 ? p_view_log->aid_base[mid] : p_view_log->aid_inc[mid]))
 			{
@@ -297,7 +300,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;
 	}
 
@@ -316,7 +319,7 @@ int article_view_log_set_viewed(int32_t
 			mid = (left + right) / 2;
 			if (aid < (i == 0 ? p_view_log->aid_base[mid] : p_view_log->aid_inc[mid]))
 			{
-				right = mid;
+				right = mid - 1;
 			}
 			else if (aid > (i == 0 ? p_view_log->aid_base[mid] : p_view_log->aid_inc[mid]))
 			{
@@ -335,7 +338,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)
@@ -360,9 +363,11 @@ int article_view_log_set_viewed(int32_t
 		right = left + 1;
 	}
 
-	for (i = p_view_log->aid_inc_cnt - 1; i >= right; i--)
+	if (p_view_log->aid_inc_cnt > right)
 	{
-		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;