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

* util/grub-mkimage.c (generate_image): Use size_t instead of

Browse source 
grub_size_t.
	* util/grub-mkimagexx.c (locate_sections): Likewise.
	(load_image): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-09 05:36:00 +02:00
parent 22f98db270
commit f7676b7016
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-10-09 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (generate_image): Use size_t instead of
grub_size_t.
* util/grub-mkimagexx.c (locate_sections): Likewise.
(load_image): Likewise.
2013-10-09 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-09 Vladimir Serbinenko <phcoder@gmail.com>
* util/misc.c (grub_util_write_image_at): Don't use PRIxGRUB_SIZE for * util/misc.c (grub_util_write_image_at): Don't use PRIxGRUB_SIZE for

4
util/grub-mkimage.c
View file

@ -790,10 +790,10 @@ generate_image (const char *dir, const char *prefix,
char *kernel_path; char *kernel_path;
size_t offset; size_t offset;
struct grub_util_path_list *path_list, *p, *next; struct grub_util_path_list *path_list, *p, *next;
grub_size_t bss_size; size_t bss_size;
grub_uint64_t start_address; grub_uint64_t start_address;
void *rel_section = 0; void *rel_section = 0;
grub_size_t reloc_size = 0, align; size_t reloc_size = 0, align;
size_t decompress_size = 0; size_t decompress_size = 0;
if (comp == COMPRESSION_AUTO) if (comp == COMPRESSION_AUTO)

14
util/grub-mkimagexx.c
View file

@ -800,8 +800,8 @@ SUFFIX (check_elf_header) (Elf_Ehdr *e, size_t size, struct image_target_desc *i
static Elf_Addr * static Elf_Addr *
SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize, SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
Elf_Half num_sections, const char *strtab, Elf_Half num_sections, const char *strtab,
grub_size_t *exec_size, grub_size_t *kernel_sz, size_t *exec_size, size_t *kernel_sz,
grub_size_t *all_align, size_t *all_align,
struct image_target_desc *image_target) struct image_target_desc *image_target)
{ {
int i; int i;
@ -879,11 +879,11 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
} }
static char * static char *
SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size, SUFFIX (load_image) (const char *kernel_path, size_t *exec_size,
grub_size_t *kernel_sz, grub_size_t *bss_size, size_t *kernel_sz, size_t *bss_size,
grub_size_t total_module_size, grub_uint64_t *start, size_t total_module_size, grub_uint64_t *start,
void **reloc_section, grub_size_t *reloc_size, void **reloc_section, size_t *reloc_size,
grub_size_t *align, size_t *align,
struct image_target_desc *image_target) struct image_target_desc *image_target)
{ {
char *kernel_img, *out_img; char *kernel_img, *out_img;