diff options
| -rw-r--r-- | pttbbs/mbbsd/ccw.c | 5 | ||||
| -rw-r--r-- | pttbbs/mbbsd/friend.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/kaede.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/passwd.c | 2 | ||||
| -rw-r--r-- | pttbbs/mbbsd/read.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/talk.c | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/pttbbs/mbbsd/ccw.c b/pttbbs/mbbsd/ccw.c index 90e24af4..727a7123 100644 --- a/pttbbs/mbbsd/ccw.c +++ b/pttbbs/mbbsd/ccw.c @@ -539,8 +539,9 @@ CCW_PROTO ssize_t ccw_talk_send(CCW_CTX *ctx, const char *msg) { // protocol: [len][msg] + // DON'T CHANGE THE TYPE(char) of len unless you change whole protocol char len = strlen(msg); - assert(len >= 0 && (int)len == strlen(msg)); + assert(len >= 0 && (size_t)(int)len == strlen(msg)); if (len < 1) return 0; // XXX if remote is closed (without MSG_NOSIGNAL), @@ -562,7 +563,7 @@ ccw_talk_recv(CCW_CTX *ctx, char *buf, size_t szbuf) return -1; if (toread(ctx->fd, buf, len)!= len) return -1; - assert(len >= 0 && len < szbuf); + assert(len >= 0 && len < (int)szbuf); buf[(size_t)len] = 0; return len; } diff --git a/pttbbs/mbbsd/friend.c b/pttbbs/mbbsd/friend.c index 4feac904..6827f7b6 100644 --- a/pttbbs/mbbsd/friend.c +++ b/pttbbs/mbbsd/friend.c @@ -71,7 +71,7 @@ friend_add(const char *uident, int type, const char* des) char fpath[PATHLEN]; setfriendfile(fpath, type); - if (friend_count(fpath) > friend_max[type]) + if (friend_count(fpath) > (int)friend_max[type]) return; if ((uident[0] > ' ') && !file_exist_record(fpath, uident)) { @@ -247,7 +247,7 @@ friend_validate(int type, int expire, int badpost) expire *= DAY_SECONDS *30; else expire = 0; - if (badpost < 0 || badpost > UCHAR_MAX) + if (badpost < 0 || (unsigned)badpost > (unsigned)UCHAR_MAX) badpost = 0; syncnow(); diff --git a/pttbbs/mbbsd/kaede.c b/pttbbs/mbbsd/kaede.c index c692b282..57b12ad7 100644 --- a/pttbbs/mbbsd/kaede.c +++ b/pttbbs/mbbsd/kaede.c @@ -81,7 +81,7 @@ Ptt_prints(char *str, size_t size, int mode) { char *strbuf = alloca(size); int r, w; - for( r = w = 0 ; str[r] != 0 && w < (size - 1) ; ++r ) + for( r = w = 0 ; str[r] != 0 && w < ((int)size - 1) ; ++r ) { if( str[r] != ESC_CHR ) { @@ -90,7 +90,7 @@ Ptt_prints(char *str, size_t size, int mode) } if( str[++r] != '*' ){ - if(w+2>=size-1) break; + if (w+2 >= (int)size-1) break; strbuf[w++] = ESC_CHR; strbuf[w++] = str[r]; continue; diff --git a/pttbbs/mbbsd/passwd.c b/pttbbs/mbbsd/passwd.c index 04a38041..fcbdf74d 100644 --- a/pttbbs/mbbsd/passwd.c +++ b/pttbbs/mbbsd/passwd.c @@ -489,7 +489,7 @@ int pwcuLoginSave () // assert(regdays >= prev_regdays); // plus one for initial day - if (u.numlogindays > prev_regdays+1) + if ((int)u.numlogindays > prev_regdays+1) u.numlogindays = prev_regdays+1; // calculate numlogindays (only increase one per each key) diff --git a/pttbbs/mbbsd/read.c b/pttbbs/mbbsd/read.c index bfc899a9..6d16831a 100644 --- a/pttbbs/mbbsd/read.c +++ b/pttbbs/mbbsd/read.c @@ -67,7 +67,7 @@ static int _iter_tag_match_title(void *ptr, void *opt) { fileheader_t *fh = (fileheader_t*) ptr; char *pattern = (char*) opt; - char *title = subject(fh->title); + const char *title = subject(fh->title); if (strncmp(pattern, title, TTLEN) != 0) return 0; @@ -272,7 +272,7 @@ thread(const keeploc_t * locmem, int stypen) int pos = locmem->crs_ln, jump = THREAD_SEARCH_RANGE, new_ln; int fd = -1, amatch = -1; int step = (stypen & RS_FORWARD) ? 1 : -1; - char *key; + const char *key; if(locmem->crs_ln==0) return locmem->crs_ln; diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c index e506eb4f..79d9edff 100644 --- a/pttbbs/mbbsd/talk.c +++ b/pttbbs/mbbsd/talk.c @@ -2911,7 +2911,7 @@ talkreply(void) outs("\n\n"); // FIXME CRASH here - assert(sig>=0 && sig<sizeof(sig_des)/sizeof(sig_des[0])); + assert(sig>=0 && sig<(int)(sizeof(sig_des)/sizeof(sig_des[0]))); prints(" (Y) 讓我們 %s 吧！" " (A) 我現在很忙，請等一會兒再 call 我\n", sig_des[sig]); prints(" (N) 我現在不想 %s " |