Simplify few strings.

diff --git a/ChangeLog b/ChangeLog
index 9c8a14a11866243e150a97c70bc443ef08013146..92af2ddbbb80fd1650b4ee6c29397e768d72deae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
index 4ea53b863a1175311c3b0c0a165e7d0c35cebff2..d5f9dcdbc8b1bf3352dd6696c148c5792283e7bf 100644 (file)
--- a/grub-core/fs/zfs/zfscrypt.c
+++ b/grub-core/fs/zfs/zfscrypt.c
@@ -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);
     }
 }
 

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index e08551403207fc104b91e1ffaf410a2a7c8cc393..b86a6c0dc3b7c44ae585d583a9a90d066a51b043 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -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))
            {

diff --git a/grub-core/loader/machoXX.c b/grub-core/loader/machoXX.c
index 3a382b3d69b63dbbf1c660a13ee88a2f685c8cfd..95c3fe564186359ae7ddb97fd4048358eb7facfd 100644 (file)
--- a/grub-core/loader/machoXX.c
+++ b/grub-core/loader/machoXX.c
@@ -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++)
     {