From 983e313a88264ac293d5502dc4631fa055996d02 Mon Sep 17 00:00:00 2001 From: victor Date: Thu, 21 Apr 2005 14:00:17 +0000 Subject: do not allow removing a NULL entry reduce branch number git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2709 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/board.c | 16 +++++++++------- mbbsd/fav.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mbbsd/board.c b/mbbsd/board.c index 78bbd92b..ed6274a8 100644 --- a/mbbsd/board.c +++ b/mbbsd/board.c @@ -582,6 +582,14 @@ show_brdlist(int head, int clsflag, int newflag) if (B_BH(ptr)->brdattr & BRD_BAD) #endif outs(" X "); + + else if (B_BH(ptr)->nuser <= 0) + prints(" %c ", B_BH(ptr)->bvote ? 'V' : ' '); + else if (B_BH(ptr)->nuser <= 10) + prints("%2d ", B_BH(ptr)->nuser); + else if (B_BH(ptr)->nuser <= 50) + prints("\033[1;33m%2d\033[m ", B_BH(ptr)->nuser); + else if (B_BH(ptr)->nuser >= 5000) outs("\033[1;34mĂz!\033[m"); else if (B_BH(ptr)->nuser >= 2000) @@ -590,14 +598,8 @@ show_brdlist(int head, int clsflag, int newflag) outs("\033[1mĂz!\033[m"); else if (B_BH(ptr)->nuser >= 100) outs("\033[1mHOT\033[m"); - else if (B_BH(ptr)->nuser > 50) + else //if (B_BH(ptr)->nuser > 50) prints("\033[1;31m%2d\033[m ", B_BH(ptr)->nuser); - else if (B_BH(ptr)->nuser > 10) - prints("\033[1;33m%2d\033[m ", B_BH(ptr)->nuser); - else if (B_BH(ptr)->nuser > 0) - prints("%2d ", B_BH(ptr)->nuser); - else - prints(" %c ", B_BH(ptr)->bvote ? 'V' : ' '); prints("%.*s\033[K", t_columns - 67, B_BH(ptr)->BM); } else { prints("%-40.40s %.*s", B_BH(ptr)->title + 7, diff --git a/mbbsd/fav.c b/mbbsd/fav.c index 306f8d45..d106828e 100644 --- a/mbbsd/fav.c +++ b/mbbsd/fav.c @@ -588,6 +588,8 @@ static inline void fav_free_item(fav_type_t *ft) */ static int fav_remove(fav_t *fp, fav_type_t *ft) { + if (fp == NULL || ft == NULL) + return -1; fav_free_item(ft); fav_decrease(fp, ft); return 0; -- cgit v1.2.3