diff options
| author | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-05-27 17:13:25 +0800 |
|---|---|---|
| committer | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-05-27 17:13:25 +0800 |
| commit | 7fb50c3a816f8b243e387dd903df6fbd732735d3 (patch) | |
| tree | 1d64a28cd87a251048652b27299fab8abcd6aa2c /include | |
| parent | 47e1682c7ad6d559f46b49d525423479d7d78316 (diff) | |
| download | pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar.gz pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar.bz2 pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar.lz pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar.xz pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.tar.zst pttbbs-7fb50c3a816f8b243e387dd903df6fbd732735d3.zip | |
- many small revise
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4487 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmsys.h | 4 | ||||
| -rw-r--r-- | include/convert.h | 15 | ||||
| -rw-r--r-- | include/perm.h | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/include/cmsys.h b/include/cmsys.h index da03e192..2b90042c 100644 --- a/include/cmsys.h +++ b/include/cmsys.h @@ -75,7 +75,7 @@ extern int file_delete_record(const char *file, const char *key, int case_sensit extern void PttLock(int fd, int start, int size, int mode); /* net.c */ -extern unsigned int ipstr2int(const char *ip); +extern uint32_t ipstr2int(const char *ip); extern int tobind(const char *addr); extern int toconnect(const char *addr); extern int toread(int fd, void *buf, int len); @@ -93,7 +93,7 @@ extern void trim(char *buf); extern void chomp(char *src); extern int strlen_noansi(const char *s); extern int strat_ansi(int count, const char *s); -extern int strip_blank(char *cbuf, char *buf); +extern int strip_blank(char *cbuf, const char *buf); extern int strip_ansi(char *buf, const char *str, enum STRIP_FLAG flag); extern void strip_nonebig5(unsigned char *str, int maxlen); extern int invalid_pname(const char *str); diff --git a/include/convert.h b/include/convert.h index a4f1b410..2800845c 100644 --- a/include/convert.h +++ b/include/convert.h @@ -5,13 +5,20 @@ #ifdef CONVERT -#define CONV_NORMAL 0 -#define CONV_GB 1 -#define CONV_UTF8 2 +enum ConvertMode { + CONV_NORMAL, + CONV_GB, + CONV_UTF8 +}; typedef ssize_t (*read_write_type)(int, void *, size_t); typedef ssize_t (*convert_type)(void *, ssize_t); -// extern int bbs_convert_type; + +extern read_write_type write_type; +extern read_write_type read_type; +extern convert_type input_type; + +extern void init_convert(); #endif // CONVERT #endif // _BBS_CONVERT_H diff --git a/include/perm.h b/include/perm.h index 3923c796..e66df594 100644 --- a/include/perm.h +++ b/include/perm.h @@ -55,7 +55,7 @@ #define PERM_FORWARD (PERM_LOGINOK) /* to do the forwarding */ #define PERM_INTERNET (PERM_LOGINOK) /* 身份認證過關的才能寄信到 Internet */ -#define HasUserPerm(x) (cuser.userlevel & (x)) +#define HasUserPerm(x) ((cuser.userlevel & (x)) != 0) #define PERM_HIDE(u) (u && (u)->userlevel & PERM_SYSOPHIDE) #define IS_BOARD(bptr) ((bptr)->brdname[0] && \ |