File fltk-1.1.10-varargs.patch of Package fltk
--- FL/forms.H 2005-04-16 01:13:17.000000000 +0100
+++ FL/forms.H 2010-03-23 17:44:46.000000000 +0000
@@ -651,7 +651,7 @@
FL_EXPORT void fl_show_message(const char *,const char *,const char *);
FL_EXPORT void fl_show_alert(const char *,const char *,const char *,int=0);
FL_EXPORT int fl_show_question(const char *,const char *,const char *);
-inline const char *fl_show_input(const char *l,const char*d=0) {return fl_input(l,d);}
+inline const char *fl_show_input(const char *l,const char*d=0) {return fl_input("%s",d,l);}
FL_EXPORT /*const*/ char *fl_show_simple_input(const char *label, const char *deflt = 0);
FL_EXPORT int fl_show_choice(
const char *m1,
--- src/Fl_File_Chooser2.cxx 2008-04-11 13:57:37.000000000 +0100
+++ src/Fl_File_Chooser2.cxx 2010-03-23 17:16:44.000000000 +0000
@@ -569,7 +569,7 @@
}
} else {
// File doesn't exist, so beep at and alert the user...
- fl_alert(existing_file_label);
+ fl_alert("%s", existing_file_label);
}
}
else if (Fl::event_key() != FL_Delete &&
@@ -757,7 +757,7 @@
// Get a directory name from the user
- if ((dir = fl_input(new_directory_label, NULL)) == NULL)
+ if ((dir = fl_input("%s", NULL, new_directory_label)) == NULL)
return;
// Make it relative to the current directory as needed...
@@ -928,7 +928,7 @@
item = showChoice->text(showChoice->value());
if (strcmp(item, custom_filter_label) == 0) {
- if ((item = fl_input(custom_filter_label, pattern_)) != NULL) {
+ if ((item = fl_input("%s", pattern_, custom_filter_label)) != NULL) {
strlcpy(pattern_, item, sizeof(pattern_));
quote_pathname(temp, item, sizeof(temp));
--- src/forms_compatability.cxx 2006-06-09 17:16:34.000000000 +0100
+++ src/forms_compatability.cxx 2010-03-23 17:56:14.000000000 +0000
@@ -202,7 +202,7 @@
}
char *fl_show_simple_input(const char *str1, const char *defstr) {
- const char *r = fl_input(str1, defstr);
+ const char *r = fl_input("%s", defstr, str1);
return (char *)(r ? r : defstr);
}
--- fluid/Fl_Function_Type.cxx 2008-01-04 22:18:40.000000000 +0000
+++ fluid/Fl_Function_Type.cxx 2010-03-23 20:46:56.419278181 +0000
@@ -181,7 +181,7 @@
function_panel->show();
const char* message = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == f_panel_cancel) goto BREAK2;
@@ -412,7 +412,7 @@
code_panel->show();
const char* message = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == code_panel_cancel) goto BREAK2;
@@ -479,7 +479,7 @@
codeblock_panel->show();
const char* message = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == codeblock_panel_cancel) goto BREAK2;
@@ -573,7 +573,7 @@
decl_panel->show();
const char* message = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == decl_panel_cancel) goto BREAK2;
@@ -710,7 +710,7 @@
declblock_panel->show();
const char* message = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == declblock_panel_cancel) goto BREAK2;
@@ -833,7 +833,7 @@
char itempath[256]; itempath[0] = 0;
int last_selected_item = 0;
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == comment_panel_cancel) goto BREAK2;
@@ -1087,7 +1087,7 @@
char *na=0,*pr=0,*p=0; // name and prefix substrings
for (;;) { // repeat as long as there are errors
- if (message) fl_alert(message);
+ if (message) fl_alert("%s", message);
for (;;) {
Fl_Widget* w = Fl::readqueue();
if (w == c_panel_cancel) goto BREAK2;
--- fluid/file.cxx 2007-05-10 13:06:31.000000000 +0100
+++ fluid/file.cxx 2010-03-23 21:02:36.948277975 +0000
@@ -159,7 +159,7 @@
if (!fin) {
char buffer[1024];
vsnprintf(buffer, sizeof(buffer), format, args);
- fl_message(buffer);
+ fl_message("%s", buffer);
} else {
fprintf(stderr, "%s:%d: ", fname, lineno);
vfprintf(stderr, format, args);