|
 |
a5bd9f6 |
From e93b2affc943ee31304c9652798e88469f25ad53 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sun, 14 Apr 2013 16:52:49 +0200
|
|
|
a5bd9f6 |
Subject: [PATCH 300/364] * grub-core/kern/ieee1275/cmain.c
|
|
|
a5bd9f6 |
(grub_ieee1275_find_options): Inline name defines used only once.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/kern/ieee1275/cmain.c | 12 ++++--------
|
|
|
a5bd9f6 |
2 files changed, 9 insertions(+), 8 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 0514e73..9df4d1e 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,10 @@
|
|
|
a5bd9f6 |
2013-04-13 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ * grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):
|
|
|
a5bd9f6 |
+ Inline name defines used only once.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2013-04-13 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
Fix memory leaks in ofnet.
|
|
|
a5bd9f6 |
Reported by: Francesco Lavra.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
|
|
|
a5bd9f6 |
index 789669a..5f6a6da 100644
|
|
|
a5bd9f6 |
--- a/grub-core/kern/ieee1275/cmain.c
|
|
|
a5bd9f6 |
+++ b/grub-core/kern/ieee1275/cmain.c
|
|
|
a5bd9f6 |
@@ -43,9 +43,6 @@ grub_ieee1275_set_flag (enum grub_ieee1275_flag flag)
|
|
|
a5bd9f6 |
grub_ieee1275_flags |= (1 << flag);
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
-#define SF "SmartFirmware(tm)"
|
|
|
a5bd9f6 |
-#define OHW "PPC Open Hack'Ware"
|
|
|
a5bd9f6 |
-
|
|
|
a5bd9f6 |
static void
|
|
|
a5bd9f6 |
grub_ieee1275_find_options (void)
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
@@ -76,7 +73,8 @@ grub_ieee1275_find_options (void)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
rc = grub_ieee1275_get_property (openprom, "CodeGen-copyright",
|
|
|
a5bd9f6 |
tmp, sizeof (tmp), 0);
|
|
|
a5bd9f6 |
- if (rc >= 0 && !grub_strncmp (tmp, SF, sizeof (SF) - 1))
|
|
|
a5bd9f6 |
+ if (rc >= 0 && !grub_strncmp (tmp, "SmartFirmware(tm)",
|
|
|
a5bd9f6 |
+ sizeof ("SmartFirmware(tm)") - 1))
|
|
|
a5bd9f6 |
is_smartfirmware = 1;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
rc = grub_ieee1275_get_property (root, "architecture",
|
|
|
a5bd9f6 |
@@ -191,7 +189,8 @@ grub_ieee1275_find_options (void)
|
|
|
a5bd9f6 |
if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom))
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
rc = grub_ieee1275_get_property (bootrom, "model", tmp, sizeof (tmp), 0);
|
|
|
a5bd9f6 |
- if (rc >= 0 && !grub_strncmp (tmp, OHW, sizeof (OHW) - 1))
|
|
|
a5bd9f6 |
+ if (rc >= 0 && !grub_strncmp (tmp, "PPC Open Hack'Ware",
|
|
|
a5bd9f6 |
+ sizeof ("PPC Open Hack'Ware") - 1))
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_BROKEN_OUTPUT);
|
|
|
a5bd9f6 |
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS);
|
|
|
a5bd9f6 |
@@ -202,9 +201,6 @@ grub_ieee1275_find_options (void)
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
-#undef SF
|
|
|
a5bd9f6 |
-#undef OHW
|
|
|
a5bd9f6 |
-
|
|
|
a5bd9f6 |
void
|
|
|
a5bd9f6 |
grub_ieee1275_init (void)
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|