proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-15 02:02:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix un-nesting of grub_util_iterate_devices hooks.

Browse Source
This commit is contained in:
Colin Watson 2013-11-15 16:53:14 +00:00
parent 4173cb958b
commit 12c2d335d1
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/patches/restore_mkdevicemap.patch vendored
View File

@ -29,13 +29,16 @@ Index: b/include/grub/util/deviceiter.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ b/include/grub/util/deviceiter.h +++ b/include/grub/util/deviceiter.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,14 @@
+#ifndef GRUB_DEVICEITER_MACHINE_UTIL_HEADER +#ifndef GRUB_DEVICEITER_MACHINE_UTIL_HEADER
+#define GRUB_DEVICEITER_MACHINE_UTIL_HEADER 1 +#define GRUB_DEVICEITER_MACHINE_UTIL_HEADER 1
+ +
+#include <config.h> +#include <config.h>
+ +
+void grub_util_iterate_devices (int (*hook) (const char *, int), +typedef int (*grub_util_iterate_devices_hook_t) (const char *name,
+ int is_floppy, void *data);
+
+void grub_util_iterate_devices (grub_util_iterate_devices_hook_t hook,
+ void *hook_data, int floppy_disks); + void *hook_data, int floppy_disks);
+void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy, +void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy,
+ int *num_fd, int *num_hd); + int *num_fd, int *num_hd);
@ -568,7 +571,7 @@ Index: b/util/deviceiter.c
+#endif /* __linux__ */ +#endif /* __linux__ */
+ +
+void +void
+grub_util_iterate_devices (int (*hook) (const char *, int), void *hook_data, +grub_util_iterate_devices (int (*hook) (const char *, int, void *), void *hook_data,
+ int floppy_disks) + int floppy_disks)
+{ +{
+ int i; + int i;
@ -1102,7 +1105,7 @@ Index: b/util/grub-mkdevicemap.c
+ if (! ctx.fp) + if (! ctx.fp)
+ grub_util_error (_("cannot open %s"), device_map); + grub_util_error (_("cannot open %s"), device_map);
+ +
+ grub_util_iterate_devices (process_device, floppy_disks, &ctx); + grub_util_iterate_devices (process_device, &ctx, floppy_disks);
+ +
+ if (ctx.fp != stdout) + if (ctx.fp != stdout)
+ fclose (ctx.fp); + fclose (ctx.fp);

5
include/grub/util/deviceiter.h
View File

@ -3,7 +3,10 @@
#include <config.h> #include <config.h>
void grub_util_iterate_devices (int (*hook) (const char *, int), typedef int (*grub_util_iterate_devices_hook_t) (const char *name,
int is_floppy, void *data);
void grub_util_iterate_devices (grub_util_iterate_devices_hook_t hook,
void *hook_data, int floppy_disks); void *hook_data, int floppy_disks);
void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy, void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy,
int *num_fd, int *num_hd); int *num_fd, int *num_hd);

2
util/deviceiter.c
View File

@ -526,7 +526,7 @@ compare_devices (const void *a, const void *b)
#endif /* __linux__ */ #endif /* __linux__ */
void void
grub_util_iterate_devices (int (*hook) (const char *, int), void *hook_data, grub_util_iterate_devices (int (*hook) (const char *, int, void *), void *hook_data,
int floppy_disks) int floppy_disks)
{ {
int i; int i;

2
util/grub-mkdevicemap.c
View File

@ -76,7 +76,7 @@ make_device_map (const char *device_map, int floppy_disks)
if (! ctx.fp) if (! ctx.fp)
grub_util_error (_("cannot open %s"), device_map); grub_util_error (_("cannot open %s"), device_map);
grub_util_iterate_devices (process_device, floppy_disks, &ctx); grub_util_iterate_devices (process_device, &ctx, floppy_disks);
if (ctx.fp != stdout) if (ctx.fp != stdout)
fclose (ctx.fp); fclose (ctx.fp);