dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch

f725e3
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f725e3
From: Vladimir Serbinenko <phcoder@gmail.com>
f725e3
Date: Sat, 18 Jan 2014 19:26:40 +0100
f725e3
Subject: [PATCH] * grub-core/commands/macbless.c: Rename FILE and DIR to avoid
f725e3
 conflicts.
f725e3
f725e3
	Reported by: Andrey Borzenkov.
f725e3
---
f725e3
 grub-core/commands/macbless.c | 6 +++---
f725e3
 ChangeLog                     | 7 +++++++
f725e3
 2 files changed, 10 insertions(+), 3 deletions(-)
f725e3
f725e3
diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c
f725e3
index c5210833ed0..4724edd7709 100644
f725e3
--- a/grub-core/commands/macbless.c
f725e3
+++ b/grub-core/commands/macbless.c
f725e3
@@ -37,7 +37,7 @@ struct find_node_context
f725e3
   grub_uint64_t inode_found;
f725e3
   char *dirname;
f725e3
   enum
f725e3
-  { NONE, FILE, DIR } found;
f725e3
+  { FOUND_NONE, FOUND_FILE, FOUND_DIR } found;
f725e3
 };
f725e3
 
f725e3
 static int
f725e3
@@ -53,7 +53,7 @@ find_inode (const char *filename,
f725e3
 	   && grub_strcasecmp (ctx->dirname, filename) == 0)))
f725e3
     {
f725e3
       ctx->inode_found = info->inode;
f725e3
-      ctx->found = info->dir ? DIR : FILE;
f725e3
+      ctx->found = info->dir ? FOUND_DIR : FOUND_FILE;
f725e3
     }
f725e3
   return 0;
f725e3
 }
f725e3
@@ -175,7 +175,7 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
f725e3
   grub_free (path);
f725e3
 
f725e3
   return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
f725e3
-			       (ctx.found == DIR), intel);
f725e3
+			       (ctx.found == FOUND_DIR), intel);
f725e3
 }
f725e3
 
f725e3
 static grub_err_t
f725e3
diff --git a/ChangeLog b/ChangeLog
f725e3
index dad469b43b1..9d1a3f051c1 100644
f725e3
--- a/ChangeLog
f725e3
+++ b/ChangeLog
f725e3
@@ -1,3 +1,10 @@
f725e3
+2014-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
f725e3
+
f725e3
+	* grub-core/commands/macbless.c: Rename FILE and DIR to avoid
f725e3
+	conflicts.
f725e3
+
f725e3
+	Reported by: Andrey Borzenkov.
f725e3
+
f725e3
 2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
f725e3
 
f725e3
 	* include/grub/misc.h: Move macros for compiler features to ...