From 22af2b22e2d6eb252ece2f60ef40e92c45fbc027 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sun, 11 Mar 2007 12:44:13 +0200 Subject: [PATCH] Cast variadic arguments of add_to_ml to void *. getml reads the args with va_arg(ap, void *), and the NULL macro in particular may have the wrong type. --- src/bfu/inpfield.c | 2 +- src/document/html/parser.c | 5 +++-- src/viewer/text/search.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bfu/inpfield.c b/src/bfu/inpfield.c index 90ad2a6ed..ed6c85904 100644 --- a/src/bfu/inpfield.c +++ b/src/bfu/inpfield.c @@ -238,7 +238,7 @@ input_field(struct terminal *term, struct memory_list *ml, int intl, add_dlg_end(dlg, INPUT_WIDGETS_COUNT); - add_to_ml(&ml, dlg, NULL); + add_to_ml(&ml, (void *) dlg, (void *) NULL); do_dialog(term, dlg, ml); } diff --git a/src/document/html/parser.c b/src/document/html/parser.c index b9bafb2a1..ca25f8edb 100644 --- a/src/document/html/parser.c +++ b/src/document/html/parser.c @@ -561,7 +561,7 @@ look_for_link(unsigned char **pos, unsigned char *eof, struct menu_item **menu, } else if (!strlcasecmp(name, namelen, "/MAP", 4)) { /* This is the only successful return from here! */ - add_to_ml(ml, *menu, NULL); + add_to_ml(ml, (void *) *menu, (void *) NULL); return 0; } else { @@ -644,7 +644,8 @@ look_for_link(unsigned char **pos, unsigned char *eof, struct menu_item **menu, nm[nmenu].flags = NO_INTL; } - add_to_ml(ml, ld, ld->link, ld->target, label, NULL); + add_to_ml(ml, (void *) ld, (void *) ld->link, (void *) ld->target, + (void *) label, (void *) NULL); return 1; } diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c index 18c44468f..a3ca067e4 100644 --- a/src/viewer/text/search.c +++ b/src/viewer/text/search.c @@ -1654,7 +1654,7 @@ search_dlg_do(struct terminal *term, struct memory_list *ml, dlg->udata = text; dlg->udata2 = hop; - add_to_ml(&ml, hop, NULL); + add_to_ml(&ml, (void *) hop, (void *) NULL); /* @field is automatically cleared by calloc() */ field = get_dialog_offset(dlg, SEARCH_WIDGETS_COUNT); @@ -1671,7 +1671,7 @@ search_dlg_do(struct terminal *term, struct memory_list *ml, add_dlg_end(dlg, SEARCH_WIDGETS_COUNT); - add_to_ml(&ml, dlg, NULL); + add_to_ml(&ml, (void *) dlg, (void *) NULL); do_dialog(term, dlg, ml); }