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

* grub-core/commands/macbless.c: Rename FILE and DIR to avoid

Browse source 
conflicts.

	Reported by: Andrey Borzenkov.
This commit is contained in:
Vladimir Serbinenko 2014-01-18 19:26:40 +01:00
parent f371dd5da8
commit 6c519b5c6c
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/macbless.c: Rename FILE and DIR to avoid
conflicts.
Reported by: Andrey Borzenkov.
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com> 2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* include/grub/misc.h: Move macros for compiler features to ... * include/grub/misc.h: Move macros for compiler features to ...

6
grub-core/commands/macbless.c
View file

@ -37,7 +37,7 @@ struct find_node_context
grub_uint64_t inode_found; grub_uint64_t inode_found;
char *dirname; char *dirname;
enum enum
{ NONE, FILE, DIR } found; { FOUND_NONE, FOUND_FILE, FOUND_DIR } found;
}; };
static int static int
@ -53,7 +53,7 @@ find_inode (const char *filename,
&& grub_strcasecmp (ctx->dirname, filename) == 0))) && grub_strcasecmp (ctx->dirname, filename) == 0)))
{ {
ctx->inode_found = info->inode; ctx->inode_found = info->inode;
ctx->found = info->dir ? DIR : FILE; ctx->found = info->dir ? FOUND_DIR : FOUND_FILE;
} }
return 0; return 0;
} }
@ -175,7 +175,7 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
grub_free (path); grub_free (path);
return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found, return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
(ctx.found == DIR), intel); (ctx.found == FOUND_DIR), intel);
} }
static grub_err_t static grub_err_t