diff options
| -rw-r--r-- | mbbsd/read.c | 16 | ||||
| -rw-r--r-- | mbbsd/var.c | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mbbsd/read.c b/mbbsd/read.c index c127d4b0..f376ad2e 100644 --- a/mbbsd/read.c +++ b/mbbsd/read.c @@ -9,6 +9,7 @@ static int last_line; // PTT: last_line 游標可指的最後一個 /* ----------------------------------------------------- */ /* Tag List 標籤 */ /* ----------------------------------------------------- */ +static TagItem *TagList; /* ascending list */ /** * @param locus @@ -32,6 +33,10 @@ Tagger(time4_t chrono, int recno, int mode) { int head, tail, posi = 0, comp; + if(TagList == NULL) { + TagList = malloc(sizeof(TagItem)*MAXTAGS); + } + for (head = 0, tail = TagNum - 1, comp = 1; head <= tail;) { posi = (head + tail) >> 1; comp = TagList[posi].chrono - chrono; @@ -58,15 +63,12 @@ Tagger(time4_t chrono, int recno, int mode) memmove(&TagList[posi], &TagList[posi + 1], (TagNum - posi) * sizeof(TagItem)); } else if (TagNum < MAXTAGS) { - TagItem *tagp, buf[MAXTAGS]; + TagItem *tagp; - /* TODO memmove 即可, 不用另開 buf[] 再 memcpy 兩次 */ - tail = (TagNum - head) * sizeof(TagItem); + memmove(&TagList[head+1], &TagList[head], sizeof(TagItem)*(TagNum-head)); tagp = &TagList[head]; - memcpy(buf, tagp, tail); tagp->chrono = chrono; tagp->recno = recno; - memcpy(++tagp, buf, tail); TagNum++; } else { bell(); @@ -76,8 +78,8 @@ Tagger(time4_t chrono, int recno, int mode) } -void -EnumTagName(char *fname, int locus) +static void +EnumTagName(char *fname, int locus) /* unused */ { snprintf(fname, sizeof(fname), "M.%d.A", (int)TagList[locus].chrono); } diff --git a/mbbsd/var.c b/mbbsd/var.c index 1389fc6c..91c042f1 100644 --- a/mbbsd/var.c +++ b/mbbsd/var.c @@ -370,7 +370,6 @@ time4_t brc_list[BRC_MAXNUM]; /* read.c */ int TagNum; /* tag's number */ -TagItem TagList[MAXTAGS]; /* ascending list */ int TagBoard = -1; /* TagBoard = 0 : user's mailbox */ /* TagBoard > 0 : bid where last taged*/ char currdirect[64]; |