vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-probe.c (probe): Don't call gettext on already translated

Browse source 
grub_errmsg.
	Remove unused variables.
	(argp_parser): Remove unused variable.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:57:00 +01:00
parent 76fb2ea93b
commit 36eb7379b3
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-probe.c (probe): Don't call gettext on already translated
grub_errmsg.
Remove unused variables.
(argp_parser): Remove unused variable.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-script-check.c (argp_parser): Remove unused variable. * util/grub-script-check.c (argp_parser): Remove unused variable.

12
util/grub-probe.c
View file

@ -398,11 +398,11 @@ probe (const char *path, char **device_names, char delim)
grub_util_info ("opening %s", drives_names[0]); grub_util_info ("opening %s", drives_names[0]);
dev = grub_device_open (drives_names[0]); dev = grub_device_open (drives_names[0]);
if (! dev) if (! dev)
grub_util_error ("%s", _(grub_errmsg)); grub_util_error ("%s", grub_errmsg);
fs = grub_fs_probe (dev); fs = grub_fs_probe (dev);
if (! fs) if (! fs)
grub_util_error ("%s", _(grub_errmsg)); grub_util_error ("%s", grub_errmsg);
if (print == PRINT_FS) if (print == PRINT_FS)
{ {
@ -429,7 +429,7 @@ probe (const char *path, char **device_names, char delim)
fs->name); fs->name);
if (fs->label (dev, &label) != GRUB_ERR_NONE) if (fs->label (dev, &label) != GRUB_ERR_NONE)
grub_util_error ("%s", _(grub_errmsg)); grub_util_error ("%s", grub_errmsg);
printf ("%s", label); printf ("%s", label);
putchar (delim); putchar (delim);
@ -445,7 +445,7 @@ probe (const char *path, char **device_names, char delim)
grub_util_info ("opening %s", *curdrive); grub_util_info ("opening %s", *curdrive);
dev = grub_device_open (*curdrive); dev = grub_device_open (*curdrive);
if (! dev) if (! dev)
grub_util_error ("%s", _(grub_errmsg)); grub_util_error ("%s", grub_errmsg);
if (print == PRINT_HINT_STR) if (print == PRINT_HINT_STR)
{ {
@ -578,7 +578,6 @@ probe (const char *path, char **device_names, char delim)
if (print == PRINT_EFI_HINT) if (print == PRINT_EFI_HINT)
{ {
char *biosname; char *biosname;
char *name;
const char *map; const char *map;
biosname = guess_efi_drive (*curdev); biosname = guess_efi_drive (*curdev);
@ -602,7 +601,6 @@ probe (const char *path, char **device_names, char delim)
if (print == PRINT_BAREMETAL_HINT) if (print == PRINT_BAREMETAL_HINT)
{ {
char *biosname; char *biosname;
char *name;
const char *map; const char *map;
biosname = guess_baremetal_drive (*curdev); biosname = guess_baremetal_drive (*curdev);
@ -723,8 +721,6 @@ argp_parser (int key, char *arg, struct argp_state *state)
know is a pointer to our arguments structure. */ know is a pointer to our arguments structure. */
struct arguments *arguments = state->input; struct arguments *arguments = state->input;
char *p;
switch (key) switch (key)
{ {
case 'd': case 'd':