revert to 1.122, some problems with new favorite system

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

1 files changed, 14 insertions, 29 deletions

diff --git a/mbbsd/board.c b/mbbsd/board.c
index 30501181..ccd208b9 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -1,4 +1,4 @@
-/* $Id: board.c,v 1.123 2003/04/15 06:01:18 in2 Exp $ */
+/* $Id: board.c,v 1.124 2003/04/15 06:07:23 in2 Exp $ */
 #include "bbs.h"
 #define BRC_STRLEN 15		/* Length of board name */
 #define BRC_MAXSIZE     24576
@@ -718,7 +718,9 @@ load_boards(char *key)
     int             type = cuser.uflag & BRDSORT_FLAG ? 1 : 0;
     int             i, n;
     int             state;
-    char            byMALLOC = 0, needREALLOC = 0;
+#ifdef CRITICAL_MEMORY
+    boardstat_t    *tmpnbrd;
+#endif
 
     if (class_bid > 0) {
 	bptr = &bcache[class_bid - 1];
@@ -731,8 +733,8 @@ load_boards(char *key)
 	nbrd = NULL;
     }
     if (class_bid <= 0) {
+	nbrd = (boardstat_t *) MALLOC(sizeof(boardstat_t) * numboards);
 	if( yank_flag == 0 ){ // fav mode
-	    nbrd = (boardstat_t *)malloc(sizeof(boardstat_t) * fav->nDatas);
             for( i = 0 ; i < fav->nDatas ; ++i ){
 		if( fav->b[i].attr & BRD_FAV ){
 		    if( fav->b[i].attr & BRD_LINE )
@@ -744,11 +746,8 @@ load_boards(char *key)
 			}
 		}
 	    }
-	    byMALLOC = 0;
-	    needREALLOC = (fav->nDatas != brdnum);
 	}
 	else{ // general case
-	    nbrd = (boardstat_t *) MALLOC(sizeof(boardstat_t) * numboards);
 	    for (i = 0; i < numboards; i++) {
 		if ((bptr = SHM->bsorted[type][i]) == NULL)
 		    continue;
@@ -761,19 +760,12 @@ load_boards(char *key)
 		    continue;
 		addnewbrdstat(n, state);
 	    }
-#ifdef CRITICAL_MEMORY
-	    byMALLOC = 1;
-#else
-	    byMALLOC = 0;
-#endif
-	    needREALLOC = 1;
 	}
 	if (class_bid == -1)
 	    qsort(nbrd, brdnum, sizeof(boardstat_t), cmpboardfriends);
 
     } else {
-	int     childcount = bptr->childcount;
-	nbrd = (boardstat_t *) malloc(childcount * sizeof(boardstat_t));
+	nbrd = (boardstat_t *) MALLOC(bptr->childcount * sizeof(boardstat_t));
 	for (bptr = bptr->firstchild[type]; bptr != (boardheader_t *) ~ 0;
 	     bptr = bptr->next[type]) {
 	    n = (int)(bptr - bcache);
@@ -783,22 +775,15 @@ load_boards(char *key)
 		continue;
 	    addnewbrdstat(n, state);
 	}
-	byMALLOC = 0;
-	needREALLOC = (childcount != brdnum);
-    }
-
-    if( needREALLOC ){
-	if( byMALLOC ){
-	    boardstat_t *newnbrd;
-	    newnbrd = (boardstat_t *)malloc(sizeof(boardstat_t) * brdnum);
-	    memcpy(newnbrd, nbrd, sizeof(boardstat_t) * brdnum);
-	    FREE(nbrd);
-	    nbrd = newnbrd;
-	}
-	else {
-	    nbrd = (boardstat_t *)realloc(nbrd, sizeof(boardstat_t) * brdnum);
-	}
     }
+#ifndef CRITICAL_MEMORY
+    nbrd = realloc(nbrd, sizeof(boardstat_t) * brdnum);
+#else
+    tmpnbrd = (boardstat_t *) malloc(sizeof(boardstat_t) * brdnum);
+    memcpy(tmpnbrd, nbrd, sizeof(boardstat_t) * brdnum);
+    FREE(nbrd);
+    nbrd = tmpnbrd;
+#endif
 }
 
 static int