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

	grub_errmsg.
	Remove unused variables.
	(argp_parser): Remove unused variable.

diff --git a/ChangeLog b/ChangeLog
index 2d5a3cd5e1ca460729b46851cc4c288906f01846..1631d5ac669e8f82bd8eb1ce2537f7ce6f66aa4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * util/grub-script-check.c (argp_parser): Remove unused variable.

diff --git a/util/grub-probe.c b/util/grub-probe.c
index a7d17ed7291b12702f695928ba147a6cadc04b57..b9699a252708bdb586ee48964c9daa5c54a45440 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -398,11 +398,11 @@ probe (const char *path, char **device_names, char delim)
       grub_util_info ("opening %s", drives_names[0]);
       dev = grub_device_open (drives_names[0]);
       if (! dev)
-       grub_util_error ("%s", _(grub_errmsg));
+       grub_util_error ("%s", grub_errmsg);
       
       fs = grub_fs_probe (dev);
       if (! fs)
-       grub_util_error ("%s", _(grub_errmsg));
+       grub_util_error ("%s", grub_errmsg);
 
       if (print == PRINT_FS)
        {
@@ -429,7 +429,7 @@ probe (const char *path, char **device_names, char delim)
                             fs->name);
 
          if (fs->label (dev, &label) != GRUB_ERR_NONE)
-           grub_util_error ("%s", _(grub_errmsg));
+           grub_util_error ("%s", grub_errmsg);
 
          printf ("%s", label);
          putchar (delim);
@@ -445,7 +445,7 @@ probe (const char *path, char **device_names, char delim)
       grub_util_info ("opening %s", *curdrive);
       dev = grub_device_open (*curdrive);
       if (! dev)
-       grub_util_error ("%s", _(grub_errmsg));
+       grub_util_error ("%s", grub_errmsg);
 
       if (print == PRINT_HINT_STR)
        {
@@ -578,7 +578,6 @@ probe (const char *path, char **device_names, char delim)
       if (print == PRINT_EFI_HINT)
        {
          char *biosname;
-         char *name;
          const char *map;
          biosname = guess_efi_drive (*curdev);
 
@@ -602,7 +601,6 @@ probe (const char *path, char **device_names, char delim)
       if (print == PRINT_BAREMETAL_HINT)
        {
          char *biosname;
-         char *name;
          const char *map;
 
          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. */
   struct arguments *arguments = state->input;
 
-  char *p;
-
   switch (key)
     {
     case 'd':