Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Mac OS X friendly arguments #1

Open
wants to merge 1 commit into
base: jellybean
Choose a base branch
from
Open

Added Mac OS X friendly arguments #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions scripts/kconfig/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ static void strip(char *str)
static void check_stdin(void)
{
if (!valid_stdin) {
printf(_("aborted!\n\n"));
printf(_("Console input/output is redirected. "));
printf(_("Run 'make oldconfig' to update configuration.\n\n"));
printf("%s", ("aborted!\n\n"));
printf("%s", ("Console input/output is redirected. "));
printf("%s", ("Run 'make oldconfig' to update configuration.\n\n"));
exit(1);
}
}
Expand All @@ -80,7 +80,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
enum symbol_type type = sym_get_type(sym);

if (!sym_has_value(sym))
printf(_("(NEW) "));
printf("%s", ("(NEW) "));

line[0] = '\n';
line[1] = 0;
Expand Down Expand Up @@ -277,7 +277,7 @@ static int conf_choice(struct menu *menu)
if (child->sym->name)
printf(" (%s)", child->sym->name);
if (!sym_has_value(child->sym))
printf(_(" (NEW)"));
printf("%s", (" (NEW)"));
printf("\n");
}
printf(_("%*schoice"), indent - 1, "");
Expand Down Expand Up @@ -415,7 +415,7 @@ static void check_conf(struct menu *menu)
if (sym_is_changable(sym) ||
(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
printf("%s", ("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
conf(rootEntry);
}
Expand Down Expand Up @@ -478,11 +478,11 @@ int main(int ac, char **av)
break;
}
case 'h':
printf(_("See README for usage info\n"));
printf("%s", ("See README for usage info\n"));
exit(0);
break;
default:
fprintf(stderr, _("See README for usage info\n"));
fprintf(stderr, "%s", ("See README for usage info\n"));
exit(1);
}
}
Expand Down Expand Up @@ -553,7 +553,7 @@ int main(int ac, char **av)
name = getenv("KCONFIG_NOSILENTUPDATE");
if (name && *name) {
fprintf(stderr,
_("\n*** Kernel configuration requires explicit update.\n\n"));
"%s", ("\n*** Kernel configuration requires explicit update.\n\n"));
return 1;
}
}
Expand Down Expand Up @@ -596,16 +596,16 @@ int main(int ac, char **av)
* All other commands are only used to generate a config.
*/
if (conf_get_changed() && conf_write(NULL)) {
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
fprintf(stderr, "%s", ("\n*** Error during writing of the kernel configuration.\n\n"));
exit(1);
}
if (conf_write_autoconf()) {
fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));
fprintf(stderr, "%s", ("\n*** Error during update of the kernel configuration.\n\n"));
return 1;
}
} else {
if (conf_write(NULL)) {
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
fprintf(stderr, "%s", ("\n*** Error during writing of the kernel configuration.\n\n"));
exit(1);
}
}
Expand Down