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

* grub-core/fs/xfs.c: Remove variable length arrays.

Browse source 
Reduces xfs.mod by 40 bytes (43 compressed).
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-20 15:52:27 +02:00
parent 3b502c29a1
commit 156e4ea071
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/xfs.c: Remove variable length arrays.
Reduces xfs.mod by 40 bytes (43 compressed).
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/fshelp.c: Remove variable length arrays. * grub-core/fs/fshelp.c: Remove variable length arrays.

13
grub-core/fs/xfs.c
View file

@ -458,7 +458,7 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
fdiro = grub_malloc (sizeof (struct grub_fshelp_node) fdiro = grub_malloc (sizeof (struct grub_fshelp_node)
- sizeof (struct grub_xfs_inode) - sizeof (struct grub_xfs_inode)
+ (1 << ctx->diro->data->sblock.log2_inode)); + (1 << ctx->diro->data->sblock.log2_inode) + 1);
if (!fdiro) if (!fdiro)
{ {
grub_print_error (); grub_print_error ();
@ -528,7 +528,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
grub_uint8_t *inopos = (((grub_uint8_t *) de) grub_uint8_t *inopos = (((grub_uint8_t *) de)
+ sizeof (struct grub_xfs_dir_entry) + sizeof (struct grub_xfs_dir_entry)
+ de->len - 1); + de->len - 1);
char name[de->len + 1]; grub_uint8_t c;
/* inopos might be unaligned. */ /* inopos might be unaligned. */
if (smallino) if (smallino)
@ -547,10 +547,11 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
| (((grub_uint64_t) inopos[7]) << 0); | (((grub_uint64_t) inopos[7]) << 0);
ino = grub_cpu_to_be64 (ino); ino = grub_cpu_to_be64 (ino);
grub_memcpy (name, de->name, de->len); c = de->name[de->len];
name[de->len] = '\0'; de->name[de->len] = '\0';
if (iterate_dir_call_hook (ino, name, &ctx)) if (iterate_dir_call_hook (ino, de->name, &ctx))
return 1; return 1;
de->name[de->len] = c;
de = ((struct grub_xfs_dir_entry *) de = ((struct grub_xfs_dir_entry *)
(((char *) de)+ sizeof (struct grub_xfs_dir_entry) + de->len (((char *) de)+ sizeof (struct grub_xfs_dir_entry) + de->len
@ -683,7 +684,7 @@ grub_xfs_mount (grub_disk_t disk)
data = grub_realloc (data, data = grub_realloc (data,
sizeof (struct grub_xfs_data) sizeof (struct grub_xfs_data)
- sizeof (struct grub_xfs_inode) - sizeof (struct grub_xfs_inode)
+ (1 << data->sblock.log2_inode)); + (1 << data->sblock.log2_inode) + 1);
if (! data) if (! data)
goto fail; goto fail;