diff options
| author | in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-04-18 16:03:55 +0800 |
|---|---|---|
| committer | in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-04-18 16:03:55 +0800 |
| commit | 87755ead67ec0872404d236e3d4df5c38f5be2f7 (patch) | |
| tree | 68b32dc3c6bd6472f9225a6b5f146ab023611fe9 | |
| parent | a1cae408724ce87a11f530b5cd5adaae22959893 (diff) | |
| download | pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar.gz pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar.bz2 pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar.lz pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar.xz pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.tar.zst pttbbs-87755ead67ec0872404d236e3d4df5c38f5be2f7.zip | |
discard 2521 due to some unknown memory problems.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2695 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | mbbsd/mbbsd.c | 10 | ||||
| -rw-r--r-- | mbbsd/var.c | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c index 2f85f7f2..227e0f01 100644 --- a/mbbsd/mbbsd.c +++ b/mbbsd/mbbsd.c @@ -323,14 +323,6 @@ add_history(const msgque_t * msg) { int i = 0, j, waterinit = 0; water_t *tmp; -#ifdef CRITICAL_MEMORY - if( !water ){ - water = (water_t*)malloc(sizeof(water_t) * 6); - memset(water, 0, sizeof(water_t) * 6); - water_which = &water[0]; - strlcpy(water[0].userid, " ¥þ³¡ ", sizeof(water[0].userid)); - } -#endif if (WATERMODE(WATER_ORIG) || WATERMODE(WATER_NEW)) add_history_water(&water[0], msg); if (WATERMODE(WATER_NEW) || WATERMODE(WATER_OFO)) { @@ -957,10 +949,8 @@ user_login(void) resolve_fcache(); /* resolve_boards(); */ numboards = SHM->Bnumber; -#ifndef CRITICAL_MEMORY memset(&water[0], 0, sizeof(water_t) * 6); strlcpy(water[0].userid, " ¥þ³¡ ", sizeof(water[0].userid)); -#endif if(getenv("SSH_CLIENT") != NULL){ char frombuf[50]; diff --git a/mbbsd/var.c b/mbbsd/var.c index ee290bd3..58f54e54 100644 --- a/mbbsd/var.c +++ b/mbbsd/var.c @@ -363,7 +363,7 @@ time4_t brc_list[BRC_MAXNUM]; /* read.c */ int TagNum; /* tag's number */ int TagBoard = -1; /* TagBoard = 0 : user's mailbox */ - /* TagBoard > 0 : bid where last taged*/ + /* TagBoard > 0 : bid where last taged */ char currdirect[64]; /* edit.c */ @@ -379,11 +379,7 @@ int raw_connection = 0; char fromhost[STRLEN] = "\0"; char water_usies = 0; FILE *fp_writelog = NULL; -#ifdef CRITICAL_MEMORY -water_t *water, *swater[6], *water_which; -#else water_t water[6], *swater[6], *water_which = &water[0]; -#endif /* chc_play.c */ |