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

* grub-core/normal/completion.c: Remove variable length arrays.

Browse source 
* grub-core/normal/menu_entry.c: Likewise.

	Reduces normal.mod by 496 bytes.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-20 13:55:35 +02:00
parent a07e6ad010
commit c7037f1d0f
3 changed files with 51 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
grub-core/normal/completion.c
View file

@ -168,36 +168,27 @@ iterate_dev (const char *devname, void *data __attribute__ ((unused)))
grub_errno = GRUB_ERR_NONE;
return 0;
}
{
char tmp[grub_strlen (devname) + sizeof (",")];
grub_memcpy (tmp, devname, grub_strlen (devname));
if (grub_strcmp (devname, current_word) == 0)
{
if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_PARTITION))
{
grub_device_close (dev);
return 1;
}
if (grub_strcmp (devname, current_word) == 0)
{
if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_PARTITION))
if (dev->disk)
if (grub_partition_iterate (dev->disk, iterate_partition, NULL))
{
grub_device_close (dev);
return 1;
}
if (dev->disk)
if (grub_partition_iterate (dev->disk, iterate_partition, NULL))
{
grub_device_close (dev);
return 1;
}
}
else
{
grub_memcpy (tmp + grub_strlen (devname), "", sizeof (""));
if (add_completion (tmp, "", GRUB_COMPLETION_TYPE_DEVICE))
{
grub_device_close (dev);
return 1;
}
}
}
}
else if (add_completion (devname, "", GRUB_COMPLETION_TYPE_DEVICE))
{
grub_device_close (dev);
return 1;
}
grub_device_close (dev);
grub_errno = GRUB_ERR_NONE;