005-fix-kconf-warnings.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. --- a/kconf/conf.c
  2. +++ b/kconf/conf.c
  3. @@ -86,7 +86,7 @@ static int conf_askvalue(struct symbol *
  4. enum symbol_type type = sym_get_type(sym);
  5. if (!sym_has_value(sym))
  6. - printf(_("(NEW) "));
  7. + printf("%s", _("(NEW) "));
  8. line[0] = '\n';
  9. line[1] = 0;
  10. @@ -282,7 +282,7 @@ static int conf_choice(struct menu *menu
  11. if (child->sym->name)
  12. printf(" (%s)", child->sym->name);
  13. if (!sym_has_value(child->sym))
  14. - printf(_(" (NEW)"));
  15. + printf("%s", _(" (NEW)"));
  16. printf("\n");
  17. }
  18. printf(_("%*schoice"), indent - 1, "");
  19. @@ -437,7 +437,7 @@ static void check_conf(struct menu *menu
  20. }
  21. } else {
  22. if (!conf_cnt++)
  23. - printf(_("*\n* Restart config...\n*\n"));
  24. + printf("%s", _("*\n* Restart config...\n*\n"));
  25. rootEntry = menu_get_parent_menu(menu);
  26. conf(rootEntry);
  27. }
  28. @@ -614,7 +614,7 @@ int main(int ac, char **av)
  29. name = getenv("KCONFIG_NOSILENTUPDATE");
  30. if (name && *name) {
  31. fprintf(stderr,
  32. - _("\n*** The configuration requires explicit update.\n\n"));
  33. + "%s", _("\n*** The configuration requires explicit update.\n\n"));
  34. return 1;
  35. }
  36. }
  37. @@ -666,22 +666,22 @@ int main(int ac, char **av)
  38. * All other commands are only used to generate a config.
  39. */
  40. if (conf_get_changed() && conf_write(NULL)) {
  41. - fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
  42. + fprintf(stderr, "%s", _("\n*** Error during writing of the configuration.\n\n"));
  43. exit(1);
  44. }
  45. if (conf_write_autoconf()) {
  46. - fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
  47. + fprintf(stderr, "%s", _("\n*** Error during update of the configuration.\n\n"));
  48. return 1;
  49. }
  50. } else if (input_mode == savedefconfig) {
  51. if (conf_write_defconfig(defconfig_file)) {
  52. - fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
  53. + fprintf(stderr, _("\n*** Error while saving defconfig to: %s\n\n"),
  54. defconfig_file);
  55. return 1;
  56. }
  57. } else if (input_mode != listnewconfig) {
  58. if (conf_write(NULL)) {
  59. - fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
  60. + fprintf(stderr, "%s", _("\n*** Error during writing of the configuration.\n\n"));
  61. exit(1);
  62. }
  63. }
  64. --- a/kconf/Makefile
  65. +++ b/kconf/Makefile
  66. @@ -17,7 +17,7 @@ clean:
  67. zconf.tab.c: zconf.lex.c
  68. %.tab.c: %.y
  69. - $(YACC) -o$@ -t -l $<
  70. + $(YACC) -Wno-yacc -o$@ -t -l $<
  71. %.lex.c: %.l
  72. $(LEX) -o$@ -L $<