summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-12-25 12:12:22 +0800
committervictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-12-25 12:12:22 +0800
commita44bad6aceb9f76b3a5c61ef80d8aba67490b151 (patch)
tree158db9f8a524109c5b173a2038e1375b0c843128
parent863180ca5dd5bacec9d4ab5e66878f8a5cfdbac8 (diff)
downloadpttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar.gz
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar.bz2
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar.lz
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar.xz
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.tar.zst
pttbbs-a44bad6aceb9f76b3a5c61ef80d8aba67490b151.zip
remove some comment, add static modifier properly
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1434 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/proto.h3
-rw-r--r--mbbsd/board.c2
-rw-r--r--mbbsd/fav.c30
3 files changed, 8 insertions, 27 deletions
diff --git a/include/proto.h b/include/proto.h
index b0a8b77d..c2cb7716 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -210,7 +210,6 @@ int iseditlocking(char *fpath, char *action);
/* fav */
void fav_set_old_folder(fav_t *fp);
-int get_data_tail(fav_t *fp);
int get_data_number(fav_t *fp);
int get_current_fav_level(void);
fav_t *get_current_fav(void);
@@ -241,7 +240,7 @@ void fav_remove_all_tagged_item(void);
void fav_add_all_tagged_item(void);
void fav_remove_all_tag(void);
void fav_set_folder_title(fav_type_t *ft, char *title);
-int fav_max_folder_level(void);
+int fav_stack_full(void);
void fav_folder_in(short fid);
void fav_folder_out(void);
void fav_free(void);
diff --git a/mbbsd/board.c b/mbbsd/board.c
index dcf2608e..65bc7a19 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -1164,7 +1164,7 @@ choose_board(int newflag)
case 'g':
if (HAS_PERM(PERM_BASIC) && yank_flag == 0) {
fav_type_t *ft;
- if (fav_max_folder_level()){
+ if (fav_stack_full()){
vmsg("目錄已達最大層數!!");
break;
}
diff --git a/mbbsd/fav.c b/mbbsd/fav.c
index d9558c68..fb78006a 100644
--- a/mbbsd/fav.c
+++ b/mbbsd/fav.c
@@ -28,9 +28,8 @@ inline static fav_line_t *cast_line(fav_type_t *p){
inline static fav_folder_t *cast_folder(fav_type_t *p){
return (fav_folder_t *)p->fp;
}
-/* --- */
-inline int get_data_tail(fav_t *fp){
+inline static int get_data_tail(fav_t *fp){
return fp->DataTail;
}
@@ -52,14 +51,13 @@ inline int get_item_type(fav_type_t *ft){
return ft->type;
}
-inline void fav_set_tmp_folder(fav_t *fp){
+inline static void fav_set_tmp_folder(fav_t *fp){
fav_tmp = fp;
}
inline static fav_t *fav_get_tmp_fav(void){
return fav_tmp;
}
-/* --- */
static void fav_decrease(fav_t *fp, fav_type_t *ft){
switch (get_item_type(ft)){
@@ -75,7 +73,6 @@ static void fav_decrease(fav_t *fp, fav_type_t *ft){
}
fav_number--;
}
-/* --- */
static void fav_increase(fav_t *fp, fav_type_t *ft)
{
@@ -95,7 +92,6 @@ static void fav_increase(fav_t *fp, fav_type_t *ft)
fav_number++;
fp->DataTail++;
}
-/* --- */
inline static int get_folder_num(fav_t *fp) {
return fp->nFolders;
@@ -127,7 +123,6 @@ void set_attr(fav_type_t *ft, int bit, char bool){
int is_set_attr(fav_type_t *ft, char bit){
return ft->attr & bit;
}
-/* --- */
char *get_item_title(fav_type_t *ft)
{
@@ -156,11 +151,11 @@ static char *get_item_class(fav_type_t *ft)
}
#ifdef MEM_CHECK
-inline void fav_set_memcheck(int n) {
+inline static void fav_set_memcheck(int n) {
memcheck = n;
}
-inline int fav_memcheck(void) {
+inline static int fav_memcheck(void) {
return memcheck;
}
#endif
@@ -307,19 +302,14 @@ void fav_sort_by_class(void)
rebuild_fav(get_current_fav());
qsort(get_current_fav()->favh, get_data_number(get_current_fav()), sizeof(fav_type_t), favcmp_by_class);
}
-/* --- */
/*
* The following is the movement operations in the user interface.
*/
-inline static int fav_stack_full(void){
+inline int fav_stack_full(void){
return fav_stack_num >= FAV_MAXDEPTH;
}
-inline int fav_max_folder_level(void){
- return fav_stack_full();
-}
-
inline static int fav_stack_push_fav(fav_t *fp){
if (fav_stack_full())
return -1;
@@ -350,8 +340,6 @@ void fav_folder_out(void)
fav_stack_pop();
}
-/* --- */
-
/* load from the rec file */
static void read_favrec(int fd, fav_t *fp)
{
@@ -408,7 +396,6 @@ int fav_load(void)
fav_set_memcheck(MEM_CHECK);
return 0;
}
-/* --- */
/* write to the rec file */
static void write_favrec(int fd, fav_t *fp)
@@ -453,14 +440,12 @@ int fav_save(void)
close(fd);
return 0;
}
-/* --- */
/* It didn't need to remove it self, just remove all the attributes.
* It'll be remove when it save to the record file. */
static void fav_free_item(fav_type_t *ft)
{
set_attr(ft, 0xFFFF, FALSE);
-// ft = NULL;
}
static int fav_non_recursive_remove(fav_t *fp, fav_type_t *ft)
@@ -499,7 +484,6 @@ void fav_free(void)
/* reset the stack */
fav_stack_num = 0;
}
-/* --- */
static fav_type_t *get_fav_item(short id, int type)
{
@@ -608,7 +592,7 @@ static int enlarge_if_full(fav_t *fp)
return 0;
}
-inline int is_maxsize(void){
+inline static int is_maxsize(void){
return fav_number >= MAX_FAV;
}
@@ -731,7 +715,6 @@ fav_type_t *fav_add_admtag(int bid)
return ft;
}
-/* --- */
/* everything about the tag in fav mode.
* I think we don't have to implement the function 'cross-folder' tag.*/
@@ -856,7 +839,6 @@ void fav_remove_all_tag(void)
{
fav_dosomething_all_tagged_item(remove_tags);
}
-/* --- */
void fav_set_folder_title(fav_type_t *ft, char *title)
{