|
 |
ea2871d |
From a8b6f41df623cd777e41e0f6d44e25617f8388c9 Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Peter Jones <pjones@redhat.com>
|
|
|
f4c76c0 |
Date: Tue, 7 Jul 2015 12:04:28 -0400
|
|
|
f4c76c0 |
Subject: [PATCH 72/74] Add some __unused__ where gcc 5.x is more picky about
|
|
|
f4c76c0 |
it.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
With some build flags, gcc 5.x throws more warnings about __unused__ not
|
|
|
f4c76c0 |
being present than older compilers did. This patch adds the annotation.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
f4c76c0 |
---
|
|
|
f4c76c0 |
grub-core/gettext/gettext.c | 10 +++++-----
|
|
|
f4c76c0 |
grub-core/normal/menu.c | 2 +-
|
|
|
f4c76c0 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
|
|
f4c76c0 |
index 1e5c21d..b22e1bc 100644
|
|
|
f4c76c0 |
--- a/grub-core/gettext/gettext.c
|
|
|
f4c76c0 |
+++ b/grub-core/gettext/gettext.c
|
|
|
f4c76c0 |
@@ -434,7 +434,7 @@ static char *
|
|
|
f4c76c0 |
grub_gettext_env_write_lang (struct grub_env_var *var
|
|
|
f4c76c0 |
__attribute__ ((unused)), const char *val)
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
- grub_err_t err;
|
|
|
f4c76c0 |
+ grub_err_t __attribute__((__unused__)) err;
|
|
|
f4c76c0 |
err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
|
|
|
f4c76c0 |
grub_env_get ("prefix"));
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
@@ -447,7 +447,7 @@ grub_gettext_env_write_lang (struct grub_env_var *var
|
|
|
f4c76c0 |
void
|
|
|
f4c76c0 |
grub_gettext_reread_prefix (const char *val)
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
- grub_err_t err;
|
|
|
f4c76c0 |
+ grub_err_t __attribute__((__unused__)) err;
|
|
|
f4c76c0 |
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"),
|
|
|
f4c76c0 |
grub_env_get ("locale_dir"),
|
|
|
f4c76c0 |
val);
|
|
|
f4c76c0 |
@@ -457,7 +457,7 @@ static char *
|
|
|
f4c76c0 |
read_main (struct grub_env_var *var
|
|
|
f4c76c0 |
__attribute__ ((unused)), const char *val)
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
- grub_err_t err;
|
|
|
f4c76c0 |
+ grub_err_t __attribute__((__unused__)) err;
|
|
|
f4c76c0 |
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
|
|
|
f4c76c0 |
grub_env_get ("prefix"));
|
|
|
f4c76c0 |
return grub_strdup (val);
|
|
|
f4c76c0 |
@@ -467,7 +467,7 @@ static char *
|
|
|
f4c76c0 |
read_secondary (struct grub_env_var *var
|
|
|
f4c76c0 |
__attribute__ ((unused)), const char *val)
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
- grub_err_t err;
|
|
|
f4c76c0 |
+ grub_err_t __attribute__((__unused__)) err;
|
|
|
f4c76c0 |
err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
|
|
|
f4c76c0 |
0);
|
|
|
f4c76c0 |
return grub_strdup (val);
|
|
|
f4c76c0 |
@@ -489,7 +489,7 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f4c76c0 |
GRUB_MOD_INIT (gettext)
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
const char *lang;
|
|
|
f4c76c0 |
- grub_err_t err;
|
|
|
f4c76c0 |
+ grub_err_t __attribute__((__unused__)) err;
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
lang = grub_env_get ("lang");
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
|
f4c76c0 |
index 5b971b3..e74cb56 100644
|
|
|
f4c76c0 |
--- a/grub-core/normal/menu.c
|
|
|
f4c76c0 |
+++ b/grub-core/normal/menu.c
|
|
|
f4c76c0 |
@@ -829,7 +829,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
/* Callback invoked immediately before a menu entry is executed. */
|
|
|
f4c76c0 |
static void
|
|
|
f4c76c0 |
-notify_booting (grub_menu_entry_t entry,
|
|
|
f4c76c0 |
+notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
|
|
|
f4c76c0 |
void *userdata __attribute__((unused)))
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
#if 0
|
|
|
f4c76c0 |
--
|
|
|
f4c76c0 |
2.4.3
|
|
|
f4c76c0 |
|