aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-27 02:56:18 -04:00
Code

[bfu] cast

Browse Source
This commit is contained in:
Witold Filipczyk 2022-01-24 21:53:18 +01:00
parent abe32780ab
commit e4550c1562
13 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bfu/button.c
View File

@ -63,7 +63,7 @@ add_dlg_button_do(struct dialog *dlg, char *text, int flags,
widget->info.button.truetextlen = textlen;
if (textlen > 1) {
char *pos = memchr(text, '~', textlen - 1);
char *pos = (char *)memchr(text, '~', textlen - 1);
if (pos) {
widget->info.button.hotkey_pos = pos - text;

2
src/bfu/dialog.c
View File

@ -457,7 +457,7 @@ dialog_ev_abort(struct dialog_data *dlg_data)
static void
dialog_func(struct window *win, struct term_event *ev)
{
struct dialog_data *dlg_data = win->data;
struct dialog_data *dlg_data = (struct dialog_data *)win->data;
dlg_data->win = win;
dlg_data->term_event = ev;

2
src/bfu/group.c
View File

@ -57,7 +57,7 @@ dlg_format_group(struct dialog_data *dlg_data,
} else if (widget_is_textfield(widget_data)) {
#ifdef CONFIG_UTF8
if (term->utf8_cp) {
width = utf8_ptr2cells(widget_data->widget->data,
width = utf8_ptr2cells((char *)widget_data->widget->data,
NULL);
} else
#endif /* CONFIG_UTF8 */

48
src/bfu/hierbox.c
View File

@ -133,7 +133,7 @@ recursively_set_expanded(struct listbox_item *item, int expanded)
static widget_handler_status_T
hierbox_ev_kbd(struct dialog_data *dlg_data)
{
struct hierbox_browser *browser = dlg_data->dlg->udata2;
struct hierbox_browser *browser = (struct hierbox_browser *)dlg_data->dlg->udata2;
struct widget_data *widget_data = dlg_data->widgets_data;
struct widget *widget = widget_data->widget;
struct listbox_data *box;
@ -213,7 +213,7 @@ hierbox_ev_kbd(struct dialog_data *dlg_data)
static widget_handler_status_T
hierbox_ev_init(struct dialog_data *dlg_data)
{
struct hierbox_browser *browser = dlg_data->dlg->udata2;
struct hierbox_browser *browser = (struct hierbox_browser *)dlg_data->dlg->udata2;
struct hierbox_dialog_list_item *item;
struct listbox_item *litem;
@ -238,7 +238,7 @@ static widget_handler_status_T
hierbox_ev_abort(struct dialog_data *dlg_data)
{
struct listbox_data *box = get_dlg_listbox_data(dlg_data);
struct hierbox_browser *browser = dlg_data->dlg->udata2;
struct hierbox_browser *browser = (struct hierbox_browser *)dlg_data->dlg->udata2;
struct hierbox_dialog_list_item *item;
/* Save state and delete the box structure */
@ -345,7 +345,7 @@ static int
scan_for_marks(struct listbox_item *item, void *info_, int *offset)
{
if (item->marked) {
struct listbox_context *context = info_;
struct listbox_context *context = (struct listbox_context *)info_;
context->item = NULL;
*offset = 0;
@ -357,7 +357,7 @@ scan_for_marks(struct listbox_item *item, void *info_, int *offset)
static int
scan_for_used(struct listbox_item *item, void *info_, int *offset)
{
struct listbox_context *context = info_;
struct listbox_context *context = (struct listbox_context *)info_;
if (context->box->ops->is_used(item)) {
context->item = item;
@ -387,7 +387,7 @@ init_listbox_context(struct listbox_data *box, struct terminal *term,
/* Look if it wouldn't be more interesting to blast off the marked
* item. */
assert(!list_empty(*box->items));
traverse_listbox_items_list(box->items->next, box, 0, 0,
traverse_listbox_items_list((struct listbox_item *)box->items->next, box, 0, 0,
scanner, context);
return context;
@ -396,7 +396,7 @@ init_listbox_context(struct listbox_data *box, struct terminal *term,
static void
done_listbox_context(void *context_)
{
struct listbox_context *context = context_;
struct listbox_context *context = (struct listbox_context *)context_;
if (context->item)
context->box->ops->unlock(context->item);
@ -482,10 +482,10 @@ recursively_goto_each_listbox(struct session *ses, struct listbox_item *root,
static int
goto_marked(struct listbox_item *item, void *data_, int *offset)
{
struct listbox_context *context = data_;
struct listbox_context *context = (struct listbox_context *)data_;
if (item->marked) {
struct session *ses = context->dlg_data->dlg->udata;
struct session *ses = (struct session *)context->dlg_data->dlg->udata;
struct listbox_data *box = context->box;
recursively_goto_listbox(ses, item, box);
@ -500,7 +500,7 @@ push_hierbox_goto_button(struct dialog_data *dlg_data,
{
struct listbox_data *box = get_dlg_listbox_data(dlg_data);
struct listbox_item *item = box->sel;
struct session *ses = dlg_data->dlg->udata;
struct session *ses = (struct session *)dlg_data->dlg->udata;
struct terminal *term = dlg_data->win->term;
struct listbox_context *context;
@ -511,7 +511,7 @@ push_hierbox_goto_button(struct dialog_data *dlg_data,
if (!context->item) {
context->dlg_data = dlg_data;
traverse_listbox_items_list(context->box->items->next,
traverse_listbox_items_list((struct listbox_item *)context->box->items->next,
context->box, 0, 0,
goto_marked, context);
@ -667,7 +667,7 @@ do_delete_item(struct listbox_item *item, struct listbox_context *info,
static int
delete_marked(struct listbox_item *item, void *data_, int *offset)
{
struct listbox_context *context = data_;
struct listbox_context *context = (struct listbox_context *)data_;
if (item->marked && !context->box->ops->is_used(item)) {
/* Save the first marked so it can be deleted last */
@ -686,14 +686,14 @@ delete_marked(struct listbox_item *item, void *data_, int *offset)
static void
push_ok_delete_button(void *context_)
{
struct listbox_context *context = context_;
struct listbox_context *context = (struct listbox_context *)context_;
struct listbox_item *root;
int last = 0;
if (context->item) {
context->box->ops->unlock(context->item);
} else {
traverse_listbox_items_list(context->box->items->next,
traverse_listbox_items_list((struct listbox_item *)context->box->items->next,
context->box, 0, 0,
delete_marked, context);
if (!context->item) return;
@ -717,7 +717,7 @@ static widget_handler_status_T
query_delete_selected_item(void *context_)
{
/* [gettext_accelerator_context(query_delete_selected_item)] */
struct listbox_context *context, *oldcontext = context_;
struct listbox_context *context, *oldcontext = (struct listbox_context *)context_;
struct terminal *term = oldcontext->term;
struct listbox_data *box = oldcontext->box;
const struct listbox_ops *ops = box->ops;
@ -824,7 +824,7 @@ push_hierbox_delete_button(struct dialog_data *dlg_data,
static int
delete_unused(struct listbox_item *item, void *data_, int *offset)
{
struct listbox_context *context = data_;
struct listbox_context *context = (struct listbox_context *)data_;
if (context->box->ops->is_used(item)) return 0;
@ -835,9 +835,9 @@ delete_unused(struct listbox_item *item, void *data_, int *offset)
static void
do_clear_browser(void *context_)
{
struct listbox_context *context = context_;
struct listbox_context *context = (struct listbox_context *)context_;
traverse_listbox_items_list(context->box->items->next,
traverse_listbox_items_list((struct listbox_item *)context->box->items->next,
context->box, 0, 0,
delete_unused, context);
}
@ -887,8 +887,8 @@ push_hierbox_clear_button(struct dialog_data *dlg_data,
static int
scan_for_matches(struct listbox_item *item, void *info_, int *offset)
{
struct listbox_context *context = info_;
char *text = (char *) context->widget_data;
struct listbox_context *context = (struct listbox_context *)info_;
char *text = (char *)context->widget_data;
if (!*text) {
item->visible = 1;
@ -924,7 +924,7 @@ mark_visible(struct listbox_item *item, void *xxx, int *offset)
static void
search_hierbox_browser(void *data, char *text)
{
struct dialog_data *dlg_data = data;
struct dialog_data *dlg_data = (struct dialog_data *)data;
struct listbox_data *box = get_dlg_listbox_data(dlg_data);
struct terminal *term = dlg_data->win->term;
struct listbox_context *context;
@ -933,9 +933,9 @@ search_hierbox_browser(void *data, char *text)
if (!context) return;
/* Eeew :/ */
context->widget_data = (void *) text;
context->widget_data = (struct widget_data *) text;
traverse_listbox_items_list(box->items->next, box, 0, 0,
traverse_listbox_items_list((struct listbox_item *)box->items->next, box, 0, 0,
scan_for_matches, context);
if (!context->item && *text) {
@ -956,7 +956,7 @@ search_hierbox_browser(void *data, char *text)
break;
}
traverse_listbox_items_list(box->items->next, box, 0, 0,
traverse_listbox_items_list((struct listbox_item *)box->items->next, box, 0, 0,
mark_visible, NULL);
}

10
src/bfu/inpfield.c
View File

@ -166,7 +166,7 @@ dlg_format_field(struct dialog_data *dlg_data,
static widget_handler_status_T
input_field_cancel(struct dialog_data *dlg_data, struct widget_data *widget_data)
{
void (*fn)(void *) = widget_data->widget->data;
void (*fn)(void *) = (void (*)(void *))widget_data->widget->data;
void *data = dlg_data->dlg->udata2;
if (fn) fn(data);
@ -177,7 +177,7 @@ input_field_cancel(struct dialog_data *dlg_data, struct widget_data *widget_data
static widget_handler_status_T
input_field_ok(struct dialog_data *dlg_data, struct widget_data *widget_data)
{
void (*fn)(void *, char *) = widget_data->widget->data;
void (*fn)(void *, char *) = (void (*)(void *, char *))widget_data->widget->data;
void *data = dlg_data->dlg->udata2;
char *text = dlg_data->widgets_data->cdata;
@ -757,7 +757,7 @@ const struct widget_ops field_pass_ops = {
static void
input_line_layouter(struct dialog_data *dlg_data)
{
struct input_line *input_line = dlg_data->dlg->udata;
struct input_line *input_line = (struct input_line *)dlg_data->dlg->udata;
struct session *ses = input_line->ses;
struct window *win = dlg_data->win;
int y = win->term->height - 1
@ -771,7 +771,7 @@ input_line_layouter(struct dialog_data *dlg_data)
static widget_handler_status_T
input_line_event_handler(struct dialog_data *dlg_data)
{
struct input_line *input_line = dlg_data->dlg->udata;
struct input_line *input_line = (struct input_line *)dlg_data->dlg->udata;
input_line_handler_T handler = input_line->handler;
enum edit_action action_id;
struct widget_data *widget_data = dlg_data->widgets_data;
@ -886,7 +886,7 @@ input_field_line(struct session *ses, char *prompt, void *data,
dlg = calloc_dialog(INPUT_LINE_WIDGETS, sizeof(*input_line));
if (!dlg) return;
input_line = (void *) get_dialog_offset(dlg, INPUT_LINE_WIDGETS);
input_line = (struct input_line *) get_dialog_offset(dlg, INPUT_LINE_WIDGETS);
input_line->ses = ses;
input_line->data = data;
input_line->handler = handler;

16
src/bfu/inphist.c
View File

@ -49,8 +49,8 @@ tab_compl(struct dialog_data *dlg_data, char *item)
static void
menu_tab_compl(struct terminal *term, void *item_, void *dlg_data_)
{
char *item = item_;
struct dialog_data *dlg_data = dlg_data_;
char *item = (char *)item_;
struct dialog_data *dlg_data = (struct dialog_data *)dlg_data_;
tab_compl_n(dlg_data, item, strlen(item));
}
@ -82,7 +82,7 @@ do_tab_compl(struct dialog_data *dlg_data,
if (n > 1) {
do_menu_selected(term, items, dlg_data, n - 1, -1);
} else {
if (n == 1) tab_compl(dlg_data, items->data);
if (n == 1) tab_compl(dlg_data, (char *)items->data);
mem_free(items);
}
}
@ -158,9 +158,9 @@ do_tab_compl_unambiguous(struct dialog_data *dlg_data,
static void
set_complete_file_menu(struct terminal *term, void *filename_, void *dlg_data_)
{
struct dialog_data *dlg_data = dlg_data_;
struct dialog_data *dlg_data = (struct dialog_data *)dlg_data_;
struct widget_data *widget_data = selected_widget(dlg_data);
char *filename = filename_;
char *filename = (char *)filename_;
int filenamelen;
assert(widget_is_textfield(widget_data));
@ -181,8 +181,8 @@ set_complete_file_menu(struct terminal *term, void *filename_, void *dlg_data_)
static void
tab_complete_file_menu(struct terminal *term, void *path_, void *dlg_data_)
{
struct dialog_data *dlg_data = dlg_data_;
char *path = path_;
struct dialog_data *dlg_data = (struct dialog_data *)dlg_data_;
char *path = (char *)path_;
auto_complete_file(term, 0 /* no_elevator */, path,
set_complete_file_menu, tab_complete_file_menu,
@ -276,7 +276,7 @@ add_to_input_history(struct input_history *history, char *data,
return;
}
entry = history->entries.prev;
entry = (struct input_history_entry *)history->entries.prev;
del_from_history_list(history, entry);
mem_free(entry);
}

2
src/bfu/leds.c
View File

@ -447,7 +447,7 @@ redraw_leds(void *xxx)
win = get_current_tab(term);
assert(win);
ses = win->data;
ses = (struct session *)win->data;
update_download_led(ses);
if (!sync_leds(ses))

22
src/bfu/listbox.c
View File

@ -170,7 +170,7 @@ traverse_listbox_items_list(struct listbox_item *item, struct listbox_data *box,
if (item && !list_empty(item->child) && item->expanded
&& (!follow_visible || item->visible)) {
/* Descend to children. */
item = item->child.next;
item = (struct listbox_item *)item->child.next;
item_cache(item);
goto done_down;
}
@ -236,7 +236,7 @@ done_down:
&& item->expanded
&& (!follow_visible || item->visible)) {
/* Descend to children. */
item = item->child.prev;
item = (struct listbox_item *)item->child.prev;
item_cache(item);
}
} else {
@ -258,7 +258,7 @@ done_down:
static int
calc_dist(struct listbox_item *item, void *data_, int *offset)
{
int *item_offset = data_;
int *item_offset = (int *)data_;
if (*offset < 0)
--*item_offset;
@ -277,7 +277,7 @@ listbox_sel_move(struct widget_data *widget_data, int dist)
if (list_empty(*box->items)) return;
if (!box->top) box->top = box->items->next;
if (!box->top) box->top = (struct listbox_item *)box->items->next;
if (!box->sel) box->sel = box->top;
/* We want to have these visible if possible. */
@ -313,7 +313,7 @@ listbox_sel_move(struct widget_data *widget_data, int dist)
static int
test_search(struct listbox_item *item, void *data_, int *offset)
{
struct listbox_context *listbox_context = data_;
struct listbox_context *listbox_context = (struct listbox_context *)data_;
if (item != listbox_context->item)
listbox_context->offset++;
@ -332,7 +332,7 @@ listbox_item_offset(struct listbox_data *box, struct listbox_item *item)
ctx.item = item;
ctx.offset = 0;
traverse_listbox_items_list(box->items->next, box, 0, 1, test_search, &ctx);
traverse_listbox_items_list((struct listbox_item *)box->items->next, box, 0, 1, test_search, &ctx);
return ctx.offset;
}
@ -352,7 +352,7 @@ listbox_sel(struct widget_data *widget_data, struct listbox_item *item)
static int
display_listbox_item(struct listbox_item *item, void *data_, int *offset)
{
struct listbox_context *data = data_;
struct listbox_context *data = (struct listbox_context *)data_;
int len; /* Length of the current text field. */
struct color_pair *tree_color, *text_color;
int depth = item->depth + 1;
@ -523,7 +523,7 @@ display_listbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
static int
check_old_state(struct listbox_item *item, void *info_, int *offset)
{
struct listbox_data *box = info_;
struct listbox_data *box = (struct listbox_data *)info_;
if (box->sel == item)
box->sel = NULL;
@ -539,14 +539,14 @@ check_old_state(struct listbox_item *item, void *info_, int *offset)
static widget_handler_status_T
init_listbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
{
struct hierbox_browser *browser = dlg_data->dlg->udata2;
struct hierbox_browser *browser = (struct hierbox_browser *)dlg_data->dlg->udata2;
struct listbox_data *box = get_listbox_widget_data(widget_data);
/* Try to restore the position from last time */
if (!list_empty(browser->root.child) && browser->box_data.items) {
copy_struct(box, &browser->box_data);
traverse_listbox_items_list(browser->root.child.next, box, 0, 0,
traverse_listbox_items_list((struct listbox_item *)browser->root.child.next, box, 0, 0,
check_old_state, box);
box->sel = (!box->sel) ? browser->box_data.sel : NULL;
@ -570,7 +570,7 @@ mouse_listbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
struct term_event *ev = dlg_data->term_event;
if (!list_empty(*box->items)) {
if (!box->top) box->top = box->items->next;
if (!box->top) box->top = (struct listbox_item *)box->items->next;
if (!box->sel) box->sel = box->top;
}

8
src/bfu/listmenu.c
View File

@ -40,8 +40,8 @@ menu_contains(struct menu_item *m, int f)
void
do_select_submenu(struct terminal *term, void *menu_, void *ses_)
{
struct menu_item *menu = menu_;
struct session *ses = ses_;
struct menu_item *menu = (struct menu_item *)menu_;
struct session *ses = (struct session *)ses_;
struct menu_item *m;
int def = int_max(0, get_current_state(ses));
int sel = 0;
@ -142,7 +142,7 @@ free_menu(struct menu_item *m) /* Grrr. Recursion */
foreach_menu_item (mm, m) {
mem_free_if(mm->text);
if (mm->func == do_select_submenu) free_menu(mm->data);
if (mm->func == do_select_submenu) free_menu((struct menu_item *)mm->data);
}
mem_free(m);
@ -182,7 +182,7 @@ menu_labels(struct menu_item *items, char *base, char **lbls)
if (item->func == do_select_submenu) {
add_to_strn(&bs, " ");
menu_labels(item->data, bs, lbls);
menu_labels((struct menu_item *)item->data, bs, lbls);
mem_free(bs);
} else {
assert(item->func == selected_item);

20
src/bfu/menu.c
View File

@ -150,14 +150,14 @@ select_menu_item(struct terminal *term, struct menu_item *it, void *data)
it->flags &= ~FREE_DATA;
while (!list_empty(term->windows)) {
struct window *win = term->windows.next;
struct window *win = (struct window *)term->windows.next;
if (win->handler != menu_handler
&& win->handler != mainmenu_handler)
break;
if (win->handler == mainmenu_handler) {
deselect_mainmenu(term, win->data);
deselect_mainmenu(term, (struct menu *)win->data);
redraw_terminal(term);
} else
delete_window(win);
@ -165,7 +165,7 @@ select_menu_item(struct terminal *term, struct menu_item *it, void *data)
}
if (action_id != ACT_MAIN_NONE && !func) {
struct session *ses = data;
struct session *ses = (struct session *)data;
do_action(ses, action_id, 1);
return;
@ -714,7 +714,7 @@ menu_mouse_handler(struct menu *menu, struct term_event *ev)
if (w1->handler != menu_handler) break;
m1 = w1->data;
m1 = (struct menu *)w1->data;
if (check_mouse_position(ev, &m1->box)) {
delete_window_ev(win, ev);
@ -808,7 +808,7 @@ search_menu_item(struct menu_item *item, char *buffer,
static enum input_line_code
menu_search_handler(struct input_line *line, int action_id)
{
struct menu *menu = line->data;
struct menu *menu = (struct menu *)line->data;
struct terminal *term = menu->win->term;
char *buffer = line->buffer;
struct window *win;
@ -824,7 +824,7 @@ menu_search_handler(struct input_line *line, int action_id)
/* XXX: The input line dialog window is above the menu window.
* Remove it from the top, so that select_menu() will correctly
* remove all the windows it has to and then readd it. */
win = term->windows.next;
win = (struct window *)term->windows.next;
del_from_list(win);
select_menu(term, menu);
add_to_list(term->windows, win);
@ -870,7 +870,7 @@ search_menu(struct menu *menu)
{
struct terminal *term = menu->win->term;
struct window *current_tab = get_current_tab(term);
struct session *ses = current_tab ? current_tab->data : NULL;
struct session *ses = (struct session *)(current_tab ? current_tab->data : NULL);
char *prompt = _("Search menu/", term);
if (menu->size < 1 || !ses) return;
@ -894,7 +894,7 @@ menu_kbd_handler(struct menu *menu, struct term_event *ev)
delete_window_ev(win, ev);
select_menu(next_win->term, next_win->data);
select_menu(next_win->term, (struct menu *)next_win->data);
return;
}
@ -999,7 +999,7 @@ enter:
static void
menu_handler(struct window *win, struct term_event *ev)
{
struct menu *menu = win->data;
struct menu *menu = (struct menu *)win->data;
menu->win = win;
@ -1345,7 +1345,7 @@ mainmenu_kbd_handler(struct menu *menu, struct term_event *ev)
static void
mainmenu_handler(struct window *win, struct term_event *ev)
{
struct menu *menu = win->data;
struct menu *menu = (struct menu *)win->data;
menu->win = win;

4
src/bfu/menu.h
View File

@ -68,8 +68,10 @@ enum menu_item_flags {
*/
#define mi_is_end_of_menu(mi) (!(mi)->text)
struct menu_item;
#define foreach_menu_item(iterator, items) \
for (iterator = (items); !mi_is_end_of_menu(iterator); (iterator)++)
for (iterator = (struct menu_item *)(items); !mi_is_end_of_menu(iterator); (iterator)++)
enum hotkey_state {
HKS_SHOW = 0,

2
src/bfu/msgbox.c
View File

@ -142,7 +142,7 @@ abort_refreshed_msg_box_handler(struct dialog_data *dlg_data)
static enum dlg_refresh_code
refresh_msg_box(struct dialog_data *dlg_data, void *data)
{
char *(*get_info)(struct terminal *, void *) = data;
char *(*get_info)(struct terminal *, void *) = (char *(*)(struct terminal *, void *))data;
void *msg_data = dlg_data->dlg->udata2;
char *info = get_info(dlg_data->win->term, msg_data);

2
src/bfu/style.c
View File

@ -63,7 +63,7 @@ get_bfu_color(struct terminal *term, const char *stylename)
stylenamelen = strlen(stylename);
item = get_hash_item(bfu_colors, stylename, stylenamelen);
entry = item ? item->value : NULL;
entry = (struct bfu_color_entry *)(item ? item->value : NULL);
if (!entry) {
struct option *opt;