From a8cf565dba1c16207d35c147ff876853126b9b8d Mon Sep 17 00:00:00 2001 From: piaip Date: Wed, 8 Jun 2005 03:28:20 +0000 Subject: eliminate warning messages and make rawmode in edit.c more suitable for dbcs aware mode git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2797 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/edit.c | 3 +++ mbbsd/file.c | 2 +- mbbsd/read.c | 3 ++- mbbsd/vice.c | 4 ++-- mbbsd/vote.c | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) (limited to 'mbbsd') diff --git a/mbbsd/edit.c b/mbbsd/edit.c index 990155cc..53e6dea3 100644 --- a/mbbsd/edit.c +++ b/mbbsd/edit.c @@ -2555,6 +2555,8 @@ vedit(char *fpath, int saveheader, int *islocal) count = 0; tin = interval; } +#ifndef DBCSAWARE_EDIT + /* this is almost useless! */ if (curr_buf->raw_mode) { switch (ch) { case Ctrl('S'): @@ -2563,6 +2565,7 @@ vedit(char *fpath, int saveheader, int *islocal) continue; } } +#endif if (phone_mode_filter(ch)) continue; diff --git a/mbbsd/file.c b/mbbsd/file.c index b0fd501e..a5937673 100644 --- a/mbbsd/file.c +++ b/mbbsd/file.c @@ -58,7 +58,7 @@ int file_delete_line(const char *file, const char *string, int case_sensitive) char fnew[80]; char genbuf[STRLEN + 1]; - sprintf(fnew, "%s.%3.3X", file, random() & 0xFFF); + sprintf(fnew, "%s.%3.3X", file, (unsigned int)(random() & 0xFFF)); if ((fp = fopen(file, "r")) && (nfp = fopen(fnew, "w"))) { int length = strlen(string); diff --git a/mbbsd/read.c b/mbbsd/read.c index 029f2421..02292db5 100644 --- a/mbbsd/read.c +++ b/mbbsd/read.c @@ -78,12 +78,13 @@ Tagger(time4_t chrono, int recno, int mode) return YEA; } - +#if 0 static void EnumTagName(char *fname, int locus) /* unused */ { snprintf(fname, sizeof(fname), "M.%d.A", (int)TagList[locus].chrono); } +#endif void EnumTagFhdr(fileheader_t * fhdr, char *direct, int locus) diff --git a/mbbsd/vice.c b/mbbsd/vice.c index 3f69e440..14e4e8f4 100644 --- a/mbbsd/vice.c +++ b/mbbsd/vice.c @@ -54,7 +54,7 @@ ran_showfile(int y, int x, const char *filename, int maxnum) char buf[512]; bzero(buf, sizeof(buf)); - snprintf(buf, sizeof(buf), "%s%d", filename, random() % maxnum + 1); + snprintf(buf, sizeof(buf), "%s%d", filename, (int)(random() % maxnum + 1)); if (!(fs = fopen(buf, "r"))) { move(10, 10); prints("can't open file: %s", buf); @@ -74,7 +74,7 @@ ran_showmfile(const char *filename, int maxnum) { char buf[256]; - snprintf(buf, sizeof(buf), "%s%d", filename, random() % maxnum + 1); + snprintf(buf, sizeof(buf), "%s%d", filename, (int)(random() % maxnum + 1)); return more(buf, YEA); } diff --git a/mbbsd/vote.c b/mbbsd/vote.c index c6c27576..036ac327 100644 --- a/mbbsd/vote.c +++ b/mbbsd/vote.c @@ -392,7 +392,7 @@ b_closepolls(void) #ifndef BARRIER_HAS_BEEN_IN_SHM char *fn_vote_polling = ".polling"; - time_t last; + unsigned long last; FILE *cfp; /* XXX necessary to lock ? */ if ((cfp = fopen(fn_vote_polling, "r"))) { @@ -400,7 +400,7 @@ b_closepolls(void) fgets(timebuf, sizeof(timebuf), cfp); sscanf(timebuf, "%lu", &last); fclose(cfp); - if (last + 3600 >= now) + if (last + 3600 >= (unsigned long)now) return 0; } if ((cfp = fopen(fn_vote_polling, "w")) == NULL) -- cgit v1.2.3