← Back to branch summary

~ubuntu-branches/ubuntu/saucy/fltk1.1/saucy

« back to all changes in this revision

Viewing changes to src/Fl_File_Chooser2.cxx

  • Committer: Package Import Robot
  • Author(s): Aaron M. Ucko
  • Date: 2011-10-02 00:06:32 UTC
  • mfrom: (5.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20111002000632-xl2d3otxlls0q971
Tags: 1.1.10-8
http://bugs.debian.org/643378
FL/forms.h, fluid/Fl_Function_Type.cxx, fluid/file.cxx,
src/Fl_File_Chooser2.cxx, src/forms_compatability.cxx (sic):
avoid calling fl_alert and the like with non-constant strings,
as caught by -Werror=format-security.  (Closes: #643378.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Fl_File_Chooser2.cxx
569
569
      }
570
570
    } else {
571
571
      // File doesn't exist, so beep at and alert the user...
572
 
      fl_alert(existing_file_label);
 
572
      fl_alert("%s", existing_file_label);
573
573
    }
574
574
  }
575
575
  else if (Fl::event_key() != FL_Delete &&
757
757
 
758
758
 
759
759
  // Get a directory name from the user
760
 
  if ((dir = fl_input(new_directory_label, NULL)) == NULL)
 
760
  if ((dir = fl_input("%s", NULL, new_directory_label)) == NULL)
761
761
    return;
762
762
 
763
763
  // Make it relative to the current directory as needed...
928
928
  item = showChoice->text(showChoice->value());
929
929
 
930
930
  if (strcmp(item, custom_filter_label) == 0) {
931
 
    if ((item = fl_input(custom_filter_label, pattern_)) != NULL) {
 
931
    if ((item = fl_input("%s", pattern_, custom_filter_label)) != NULL) {
932
932
      strlcpy(pattern_, item, sizeof(pattern_));
933
933
 
934
934
      quote_pathname(temp, item, sizeof(temp));