MAX_MOVIE is changed from 999 to 500 (reload_pttcache loads only 500 items)

Those hard coded "500" are changed to MAX_MOVIE now.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3449 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 6 insertions, 4 deletions

diff --git a/include/config.h b/include/config.h
index cd62633e..322aa3ca 100644
--- a/include/config.h
+++ b/include/config.h
@@ -160,7 +160,7 @@
 #define MAX_FRIEND        (256)          /* 載入 cache 之最多朋友數目 */
 #define MAX_REJECT        (32)           /* 載入 cache 之最多壞人數目 */
 #define MAX_MSGS          (10)           /* 水球(熱訊)忍耐上限 */
-#define MAX_MOVIE         (999)          /* 最多動態看板數 */
+#define MAX_MOVIE         (500)          /* 最多動態看板數 */
 #define MAX_MOVIE_SECTION (10)		 /* 最多動態看板類別 */
 #define MAX_ITEMS         (1000)         /* 一個目錄最多有幾項 */
 #define MAX_HISTORY       (12)           /* 動態看板保持 12 筆歷史記錄 */
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 537bbcfd..0bd0e0df 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -562,6 +562,8 @@ typedef struct {
 
     /* pttcache */
     char    notes[MAX_MOVIE][200*11];
+    // 有人反應 200 不夠用，將來可能會提高
+    char    this_is_unused_and_should_be_removed_later[499][200*11];
     char    gap_18[sizeof(int)];
     char    today_is[20];
     int     n_notes[MAX_MOVIE_SECTION];      /* 一節中有幾個 看板 */
diff --git a/mbbsd/cal.c b/mbbsd/cal.c
index e21ce80f..1966d237 100644
--- a/mbbsd/cal.c
+++ b/mbbsd/cal.c
@@ -224,10 +224,10 @@ osong(void)
 
     if (append_record(OSONGPATH "/.DIR", &mail, sizeof(mail)) != -1) {
 	cuser.lastsong = now;
-	/* Jaky 超過 500 首歌就開始砍 */
+	/* Jaky 超過 MAX_MOVIE 首歌就開始砍 */
 	nsongs = get_num_records(OSONGPATH "/.DIR", sizeof(mail));
-	if (nsongs > 500) {
-	    delete_range(OSONGPATH "/.DIR", 1, nsongs - 500);
+	if (nsongs > MAX_MOVIE) {
+	    delete_range(OSONGPATH "/.DIR", 1, nsongs - MAX_MOVIE);
 	}
 	snprintf(genbuf, sizeof(genbuf), "%s says \"%s\" to %s.", sender, say, receiver);
 	log_usies("OSONG", genbuf);