Commit: 66ef7e4583d9c07b6d6e4c1093de1f723b2b4e42
Parent: f50f3adcbdf28e958610f7eb5a7356dac37121d9
Author: opask
Date: Wed, 25 Jul 2018 06:40:55 -0600
Revert "remove unused function in bfu.c"
for now just remove unused arguments to silence compiler warning
This reverts commit f50f3adcbdf28e958610f7eb5a7356dac37121d9.
Diffstat:
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/bfu.c b/bfu.c
@@ -2370,6 +2370,10 @@ static void input_field_fn(struct dialog_data *dlg)
dlg_format_buttons(dlg, term, dlg->items + 1, dlg->n - 1, dlg->x + DIALOG_LB, &y, w, NULL, AL_CENTER);
}
+void input_field_null(void)
+{
+}
+
/* coverity[+free : arg-1] */
void input_field(struct terminal *term, struct memory_list *ml, unsigned char *title, unsigned char *text, void *data, struct history *history, int l, unsigned char *def, int min, int max, int (*check)(struct dialog_data *, struct dialog_item_data *), int n, ...)
{
diff --git a/block.c b/block.c
@@ -293,7 +293,7 @@ void block_url_query(struct session *ses, unsigned char *u)
if (test_list_window_in_use(&blocks_ld, ses->term))
return;
- input_field(ses->term, NULL, TEXT_(T_BLOCK_URL), TEXT_(T_BLOCK_ADD), ses, 0, MAX_INPUT_URL_LEN, u, 0, 0, NULL, 2, TEXT_(T_OK), block_url_add, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, NULL, TEXT_(T_BLOCK_URL), TEXT_(T_BLOCK_ADD), ses, 0, MAX_INPUT_URL_LEN, u, 0, 0, NULL, 2, TEXT_(T_OK), block_url_add, TEXT_(T_CANCEL), input_field_null);
}
diff --git a/links.h b/links.h
@@ -2867,6 +2867,7 @@ void msg_box(struct terminal *, struct memory_list *, unsigned char *, int, /*un
* ... other buttons
*/
+void input_field_null(void);
void input_field(struct terminal *, struct memory_list *, unsigned char *, unsigned char *, void *, struct history *, int, unsigned char *, int, int, int (*)(struct dialog_data *, struct dialog_item_data *), int n, ...);
/* input_field arguments:
* terminal,
diff --git a/listedit.c b/listedit.c
@@ -1358,7 +1358,7 @@ static int list_event_handler(struct dialog_data *dlg, struct links_event *ev)
r->ld=ld;
r->dlg=dlg;
- input_field(ses->term, getml(r,NULL), TEXT_(T_SEARCH), TEXT_(T_SEARCH_FOR_TEXT), r, ld->search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), list_search_for, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, getml(r,NULL), TEXT_(T_SEARCH), TEXT_(T_SEARCH_FOR_TEXT), r, ld->search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), list_search_for, TEXT_(T_CANCEL), input_field_null);
return EVENT_PROCESSED;
}
if (ev->x=='?') /* search back */
@@ -1369,7 +1369,7 @@ static int list_event_handler(struct dialog_data *dlg, struct links_event *ev)
r->ld=ld;
r->dlg=dlg;
- input_field(ses->term, getml(r,NULL), TEXT_(T_SEARCH_BACK), TEXT_(T_SEARCH_FOR_TEXT), r, ld->search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), list_search_for_back, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, getml(r,NULL), TEXT_(T_SEARCH_BACK), TEXT_(T_SEARCH_FOR_TEXT), r, ld->search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), list_search_for_back, TEXT_(T_CANCEL), input_field_null);
return EVENT_PROCESSED;
}
if (ev->x=='n') /* find next */
diff --git a/menu.c b/menu.c
@@ -3174,12 +3174,12 @@ struct history goto_url_history = { 0, { &goto_url_history.items, &goto_url_hist
void dialog_goto_url(struct session *ses, unsigned char *url)
{
- input_field(ses->term, NULL, TEXT_(T_GOTO_URL), TEXT_(T_ENTER_URL), ses, &goto_url_history, MAX_INPUT_URL_LEN, url, 0, 0, NULL, 2, TEXT_(T_OK), goto_url, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, NULL, TEXT_(T_GOTO_URL), TEXT_(T_ENTER_URL), ses, &goto_url_history, MAX_INPUT_URL_LEN, url, 0, 0, NULL, 2, TEXT_(T_OK), goto_url, TEXT_(T_CANCEL), input_field_null);
}
void dialog_save_url(struct session *ses)
{
- input_field(ses->term, NULL, TEXT_(T_SAVE_URL), TEXT_(T_ENTER_URL), ses, &goto_url_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), save_url, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, NULL, TEXT_(T_SAVE_URL), TEXT_(T_ENTER_URL), ses, &goto_url_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), save_url, TEXT_(T_CANCEL), input_field_null);
}
@@ -3381,7 +3381,7 @@ void search_back_dlg(struct session *ses, struct f_data_c *f, int a)
msg_box(ses->term, NULL, TEXT_(T_SEARCH), AL_LEFT, TEXT_(T_YOU_ARE_NOWHERE), MSG_BOX_END, NULL, 1, TEXT_(T_OK), msg_box_null, B_ENTER | B_ESC);
return;
}
- input_field(ses->term, NULL, TEXT_(T_SEARCH_BACK), TEXT_(T_SEARCH_FOR_TEXT), ses, &search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), search_for_back, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, NULL, TEXT_(T_SEARCH_BACK), TEXT_(T_SEARCH_FOR_TEXT), ses, &search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), search_for_back, TEXT_(T_CANCEL), input_field_null);
}
void search_dlg(struct session *ses, struct f_data_c *f, int a)
@@ -3390,7 +3390,7 @@ void search_dlg(struct session *ses, struct f_data_c *f, int a)
msg_box(ses->term, NULL, TEXT_(T_SEARCH_FOR_TEXT), AL_LEFT, TEXT_(T_YOU_ARE_NOWHERE), MSG_BOX_END, NULL, 1, TEXT_(T_OK), msg_box_null, B_ENTER | B_ESC);
return;
}
- input_field(ses->term, NULL, TEXT_(T_SEARCH), TEXT_(T_SEARCH_FOR_TEXT), ses, &search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), search_for, TEXT_(T_CANCEL), NULL);
+ input_field(ses->term, NULL, TEXT_(T_SEARCH), TEXT_(T_SEARCH_FOR_TEXT), ses, &search_history, MAX_INPUT_URL_LEN, cast_uchar "", 0, 0, NULL, 2, TEXT_(T_OK), search_for, TEXT_(T_CANCEL), input_field_null);
}
void free_history_lists(void)
diff --git a/view.c b/view.c
@@ -2943,7 +2943,7 @@ static int frame_ev(struct session *ses, struct f_data_c *fd, struct links_event
d[1] = 0;
nl = f_data->nlinks, lnl = 1;
while (nl) nl /= 10, lnl++;
- if (lnl > 1) input_field(ses->term, NULL, TEXT_(T_GO_TO_LINK), TEXT_(T_ENTER_LINK_NUMBER), ses, NULL, lnl, d, 1, f_data->nlinks, check_number, 2, TEXT_(T_OK), goto_link_number, TEXT_(T_CANCEL), NULL);
+ if (lnl > 1) input_field(ses->term, NULL, TEXT_(T_GO_TO_LINK), TEXT_(T_ENTER_LINK_NUMBER), ses, NULL, lnl, d, 1, f_data->nlinks, check_number, 2, TEXT_(T_OK), goto_link_number, TEXT_(T_CANCEL), input_field_null);
}
else x = 0;
} else if (ev->ev == EV_MOUSE && (ev->b & BM_BUTT) <= B_RIGHT) {