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

Simplify few strings.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-07 11:44:15 +02:00
parent d22840ec12
commit fb2666b560
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
Simplify few strings.
2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
Mark few forgotten strings for translation.

4
grub-core/fs/zfs/zfscrypt.c
View file

@ -263,8 +263,8 @@ algo_decrypt (grub_crypto_cipher_handle_t cipher, grub_uint64_t algo,
return grub_gcm_decrypt (cipher, out, in, psize, mac_out, nonce,
15 - l, m);
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "algorithm %"
PRIuGRUB_UINT64_T " is not supported yet", algo);
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "algorithm %lld is not supported yet",
(long long) algo);
}
}

3
grub-core/lib/relocator.c
View file

@ -599,7 +599,8 @@ malloc_in_range (struct grub_relocator *rel,
do
{
if (p->magic != GRUB_MM_FREE_MAGIC)
grub_fatal (__FILE__":%d free magic broken at %p (0x%x)\n",
grub_fatal ("%s:%d free magic broken at %p (0x%x)\n",
__FILE__,
__LINE__, p, p->magic);
if (p == (grub_mm_header_t) (r + 1))
{

4
grub-core/loader/machoXX.c
View file

@ -55,7 +55,7 @@ SUFFIX (grub_macho_parse) (grub_macho_t macho, const char *filename)
if (head.macho.magic != GRUB_MACHO_MAGIC)
{
grub_error (GRUB_ERR_BAD_OS, "invalid Mach-O " XX "-bit header");
grub_error (GRUB_ERR_BAD_OS, "invalid Mach-O header");
macho->offsetXX = -1;
return;
}
@ -154,7 +154,7 @@ grub_macho_cmds_iterate (grub_macho_t macho,
}
if (! macho->cmdsXX)
return grub_error (GRUB_ERR_BAD_OS, "couldn't find " XX "-bit Mach-O");
return grub_error (GRUB_ERR_BAD_OS, "couldn't find Mach-O commands");
hdrs = macho->cmdsXX;
for (i = 0; i < macho->ncmdsXX; i++)
{