diff --git a/src/ChangeLog b/src/ChangeLog index 77f45a733..7b81ed139 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2004-09-01 Pavel S. Shirshov + + * color.c (mc_init_pair): Use cast to avoid warning. + * screen.c (display_mini_info): Likewise. + * slint.c (do_define_key): Likewise. + * tree.c (tree_show_mini_info): Likewise. (show_tree):Likewise. + * view.c (view_status): Likewise. + 2004-08-29 Roland Illig * background.c (do_background): Fixed file descriptor leak. diff --git a/src/color.c b/src/color.c index 8d0a4070c..1e5ea56a4 100644 --- a/src/color.c +++ b/src/color.c @@ -361,7 +361,7 @@ mc_init_pair (int index, CTYPE foreground, CTYPE background) if (!foreground) foreground = "default"; - SLtt_set_color (index, "", foreground, background); + SLtt_set_color (index, "", (char *) foreground, (char *) background); if (index > max_index) max_index = index; } diff --git a/src/screen.c b/src/screen.c index 95b3782c1..02cec5e76 100644 --- a/src/screen.c +++ b/src/screen.c @@ -659,7 +659,7 @@ display_mini_info (WPanel *panel) p += 2; } else cols -= 2; - printw (p, cols, buffer); + printw ((char *) p, cols, buffer); return; } diff --git a/src/slint.c b/src/slint.c index d987e9c53..a095588c8 100644 --- a/src/slint.c +++ b/src/slint.c @@ -480,7 +480,7 @@ do_define_key (int code, const char *strcap) { char *seq; - seq = (char *) SLtt_tgetstr (strcap); + seq = (char *) SLtt_tgetstr ((char*) strcap); if (seq) define_sequence (code, seq, MCKEY_NOACTION); } diff --git a/src/tree.c b/src/tree.c index ccdfde3a0..a6d0dc1ff 100644 --- a/src/tree.c +++ b/src/tree.c @@ -173,12 +173,12 @@ static void tree_show_mini_info (WTree *tree, int tree_lines, int tree_cols) attrset (FOCUSC); addch (PATH_SEP); - addstr (name_trunc (tree->search_buffer, tree_cols-2)); + addstr ((char *) name_trunc (tree->search_buffer, tree_cols-2)); addch (' '); attrset (FOCUSC); } else { /* Show full name of selected directory */ - addstr (name_trunc (tree->selected_ptr->name, tree_cols)); + addstr ((char *) name_trunc (tree->selected_ptr->name, tree_cols)); } } @@ -265,7 +265,7 @@ static void show_tree (WTree *tree) } /* Show full name */ - addstr (name_trunc (current->name, tree_cols - 6)); + addstr ((char *) name_trunc (current->name, tree_cols - 6)); } else{ /* Sub level directory */ @@ -299,7 +299,7 @@ static void show_tree (WTree *tree) /* Show sub-name */ addch (' '); - addstr (name_trunc (current->subname, + addstr ((char *) name_trunc (current->subname, tree_cols - 2 - 4 - 3 * j)); } addch (' '); diff --git a/src/view.c b/src/view.c index db3c7a5d8..c837a658e 100644 --- a/src/view.c +++ b/src/view.c @@ -784,7 +784,7 @@ view_status (WView *view, gboolean update_gui) } if (w < i18n_adjust + 6) - addstr (name_trunc (view->filename ? view->filename : + addstr ((char *) name_trunc (view->filename ? view->filename : view->command ? view->command : "", w)); else { i = (w > 22 ? 22 : w) - i18n_adjust;