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

* grub-core/partmap/bsdlabel.c: Include grub/emu/misc.h and not grub/util/misc.h. 

(iterate_real): Don't rely on partition being non-NULL.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-22 14:15:17 +01:00
parent 80f23be71f
commit ffc8f4d8bc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/bsdlabel.c: Include grub/emu/misc.h and not grub/util/misc.h.
(iterate_real): Don't rely on partition being non-NULL.
2011-01-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/argv.c (round_up_exp): unsigned is 32-bit on all

5
grub-core/partmap/bsdlabel.c
View File

@ -26,7 +26,7 @@
#include <grub/msdos_partition.h>
#ifdef GRUB_UTIL
#include <grub/util/misc.h>
#include <grub/emu/misc.h>
#endif
static struct grub_partition_map grub_bsdlabel_partition_map;
@ -101,7 +101,8 @@ iterate_real (grub_disk_t disk, grub_disk_addr_t sector, int freebsd,
#ifdef GRUB_UTIL
char *partname;
/* disk->partition != NULL as 0 < delta */
partname = grub_partition_get_name (disk->partition);
partname = disk->partition ? grub_partition_get_name (disk->partition)
: "";
grub_util_warn ("Discarding improperly nested partition (%s,%s,%s%d)",
disk->name, partname, p.partmap->name, p.number + 1);
grub_free (partname);