2009-12-25 Carles Pina i Estany <carles@pina.cat>

	* commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by
	`couldn't' and `can not' by `cannot'.
	* commands/i386/pc/drivemap.c: Likewise.
	* disk/ata.c: Likewise.
	* disk/ieee1275/nand.c: Likewise.
	* fs/affs.c: Likewise.
	* fs/fat.c: Likewise.
	* fs/hfs.c: Likewise.
	* fs/hfsplus.c: Likewise.
	* fs/iso9660.c: Likewise.
	* fs/jfs.c: Likewise.
	* fs/minix.c: Likewise.
	* fs/reiserfs.c: Likewise.
	* fs/sfs.c: Likewise.
	* fs/udf.c: Likewise.
	* fs/ufs.c: Likewise.
	* fs/xfs.c: Likewise.
	* loader/powerpc/ieee1275/linux.c: Likewise.
	* loader/sparc64/ieee1275/linux.c: Likewise.
	* util/grub-probe.c: Likewise.
	* util/misc.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9601cb2c42076ec4b41be6b239d1f0dced3af4aa..e32efc6d99cd73fcbeccb81f200e19cba36a5218 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2009-12-25  Carles Pina i Estany  <carles@pina.cat>
+
+       * commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by
+       `couldn't' and `can not' by `cannot'.
+       * commands/i386/pc/drivemap.c: Likewise.
+       * disk/ata.c: Likewise.
+       * disk/ieee1275/nand.c: Likewise.
+       * fs/affs.c: Likewise.
+       * fs/fat.c: Likewise.
+       * fs/hfs.c: Likewise.
+       * fs/hfsplus.c: Likewise.
+       * fs/iso9660.c: Likewise.
+       * fs/jfs.c: Likewise.
+       * fs/minix.c: Likewise.
+       * fs/reiserfs.c: Likewise.
+       * fs/sfs.c: Likewise.
+       * fs/udf.c: Likewise.
+       * fs/ufs.c: Likewise.
+       * fs/xfs.c: Likewise.
+       * loader/powerpc/ieee1275/linux.c: Likewise.
+       * loader/sparc64/ieee1275/linux.c: Likewise.
+       * util/grub-probe.c: Likewise.
+       * util/misc.c: Likewise.
+
 2009-12-24  Carles Pina i Estany  <carles@pina.cat>
 
        * bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in

diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index 6f96d4826f9d374450dec2d2806fdefa9ac36957..877b5da17245fa470648985a34cfb3b69e96a60b 100644 (file)
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -160,7 +160,7 @@ grub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),
   int size;
 
   if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no rom image specified");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no ROM image specified");
 
   if (argc > 1)
     {

diff --git a/commands/i386/pc/drivemap.c b/commands/i386/pc/drivemap.c
index 967c952392dea034bc7c7655fc77aa29c8acbde5..adef57576cb86e533fd8d01c8adfecd889becba3 100644 (file)
--- a/commands/i386/pc/drivemap.c
+++ b/commands/i386/pc/drivemap.c
@@ -308,7 +308,7 @@ install_int13_handler (int noret __attribute__ ((unused)))
                                                GRUB_MACHINE_MEMORY_RESERVED,
                                                GRUB_MMAP_MALLOC_LOW);
   if (! handler_base)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "could not reserve "
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't reserve "
                       "memory for the int13h handler");
 
   /* Copy int13h handler bundle to reserved area.  */

diff --git a/disk/ata.c b/disk/ata.c
index bfd53cbafb3dc75beff907eb8c4f1cb796582930..864ae94880ef8de0d9a89ae314bc59d784e1e4ac 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -281,7 +281,7 @@ grub_ata_identify (struct grub_ata_device *dev)
       else
        /* Other Error.  */
        return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-                          "device can not be identified");
+                          "device cannot be identified");
     }
 
   grub_ata_pio_read (dev, info, GRUB_DISK_SECTOR_SIZE);
@@ -520,7 +520,7 @@ grub_ata_setaddress (struct grub_ata_device *dev,
            || cylinder > dev->cylinders
            || head > dev->heads)
          return grub_error (GRUB_ERR_OUT_OF_RANGE,
-                            "sector %d can not be addressed "
+                            "sector %d cannot be addressed "
                             "using CHS addressing", sector);
 
        grub_ata_regset (dev, GRUB_ATA_REG_DISK, (dev->device << 4) | head);

diff --git a/disk/ieee1275/nand.c b/disk/ieee1275/nand.c
index 76402a9a66780b550507764793898a46bbdb2a36..a9ed553cf7f01595a84e7659ef79fa2a6391ce14 100644 (file)
--- a/disk/ieee1275/nand.c
+++ b/disk/ieee1275/nand.c
@@ -67,7 +67,7 @@ grub_nand_open (const char *name, grub_disk_t disk)
     } args;
 
   if (! grub_strstr (name, "nand"))
-    return  grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a nand device");
+    return  grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a NAND device");
 
   data = grub_malloc (sizeof (*data));
   if (! data)

diff --git a/fs/affs.c b/fs/affs.c
index cfe7d579bd500b50bde611dfaee5c504108edf7b..de20fbca1895eee04f8182d7197e962f708d8884 100644 (file)
--- a/fs/affs.c
+++ b/fs/affs.c
@@ -182,14 +182,14 @@ grub_affs_mount (grub_disk_t disk)
   /* Make sure this is an affs filesystem.  */
   if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not an affs filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not an AFFS filesystem");
       goto fail;
     }
 
   /* Test if the filesystem is a OFS filesystem.  */
   if (! (data->bblock.flags & GRUB_AFFS_FLAG_FFS))
     {
-      grub_error (GRUB_ERR_BAD_FS, "ofs not yet supported");
+      grub_error (GRUB_ERR_BAD_FS, "OFS not yet supported");
       goto fail;
     }
 
@@ -231,7 +231,7 @@ grub_affs_mount (grub_disk_t disk)
     }
   if (-checksum != checksumr)
     {
-      grub_error (GRUB_ERR_BAD_FS, "affs blocksize could not be determined");
+      grub_error (GRUB_ERR_BAD_FS, "AFFS blocksize couldn't be determined");
       goto fail;
     }
   blocksize++;
@@ -248,7 +248,7 @@ grub_affs_mount (grub_disk_t disk)
 
  fail:
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not an affs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not an AFFS filesystem");
 
   grub_free (data);
   grub_free (rootblock);

diff --git a/fs/fat.c b/fs/fat.c
index ab84ee49a727ea88db405f1e4b6674709e3e6eb0..8a0fc029248c14f3d74b7f14a944aa0c09ab6144 100644 (file)
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -338,7 +338,7 @@ grub_fat_mount (grub_disk_t disk)
  fail:
 
   grub_free (data);
-  grub_error (GRUB_ERR_BAD_FS, "not a fat filesystem");
+  grub_error (GRUB_ERR_BAD_FS, "not a FAT filesystem");
   return 0;
 }
 

diff --git a/fs/hfs.c b/fs/hfs.c
index 4934550542f5d37e21246011abc0c69c7f476227..4dd1e31316032764aca12be5b0780e2c6c3721ab 100644 (file)
--- a/fs/hfs.c
+++ b/fs/hfs.c
@@ -365,7 +365,7 @@ grub_hfs_mount (grub_disk_t disk)
   if (grub_hfs_find_node (data, (char *) &key, data->cat_root,
                          0, (char *) &dir, sizeof (dir)) == 0)
     {
-      grub_error (GRUB_ERR_BAD_FS, "can not find the hfs root directory");
+      grub_error (GRUB_ERR_BAD_FS, "cannot find the HFS root directory");
       goto fail;
     }
 
@@ -379,7 +379,7 @@ grub_hfs_mount (grub_disk_t disk)
   grub_free (data);
 
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not a hfs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not a HFS filesystem");
 
   return 0;
 }

diff --git a/fs/hfsplus.c b/fs/hfsplus.c
index b57ad949fedc880ce37f31fd6229f92c9abdb9b3..9310b65023d17798829519f73ecea8e3ce6b3558 100644 (file)
--- a/fs/hfsplus.c
+++ b/fs/hfsplus.c
@@ -502,7 +502,7 @@ grub_hfsplus_mount (grub_disk_t disk)
  fail:
 
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not a hfsplus filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem");
 
   grub_free (data);
   return 0;

diff --git a/fs/iso9660.c b/fs/iso9660.c
index fb642e76985cbc75623fb5c1ad9ed637e687b258..2fb0ffb6308bfb7b43b86b3e6ec3c1d99b44f2a9 100644 (file)
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -280,13 +280,13 @@ grub_iso9660_mount (grub_disk_t disk)
                          sizeof (struct grub_iso9660_primary_voldesc),
                          (char *) &voldesc))
         {
-          grub_error (GRUB_ERR_BAD_FS, "not a iso9660 filesystem");
+          grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
           goto fail;
         }
 
       if (grub_strncmp ((char *) voldesc.voldesc.magic, "CD001", 5) != 0)
         {
-          grub_error (GRUB_ERR_BAD_FS, "not a iso9660 filesystem");
+          grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
           goto fail;
         }
 
@@ -315,7 +315,7 @@ grub_iso9660_mount (grub_disk_t disk)
                             << GRUB_ISO9660_LOG2_BLKSZ), 0,
                      sizeof (rootdir), (char *) &rootdir))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a iso9660 filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
       goto fail;
     }
 
@@ -331,7 +331,7 @@ grub_iso9660_mount (grub_disk_t disk)
                             << GRUB_ISO9660_LOG2_BLKSZ), sua_pos,
                      sua_size, sua))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a iso9660 filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
       goto fail;
     }
 

diff --git a/fs/jfs.c b/fs/jfs.c
index 2c7f0f2204e2fc1fbf68ecb0fdc31e116ab3ff66..dc5eaed67a993a99a948bf669d416ac3288b2a45 100644 (file)
--- a/fs/jfs.c
+++ b/fs/jfs.c
@@ -344,7 +344,7 @@ grub_jfs_mount (grub_disk_t disk)
 
   if (grub_strncmp ((char *) (data->sblock.magic), "JFS1", 4))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a jfs filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a JFS filesystem");
       goto fail;
     }
 
@@ -363,7 +363,7 @@ grub_jfs_mount (grub_disk_t disk)
   grub_free (data);
 
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not a jfs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not a JFS filesystem");
 
   return 0;
 }
@@ -715,7 +715,7 @@ grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino)
 
   grub_jfs_find_file (data, symlink);
   if (grub_errno)
-    grub_error (grub_errno, "can not follow symlink `%s'", symlink);
+    grub_error (grub_errno, "cannot follow symlink `%s'", symlink);
 
   return grub_errno;
 }

diff --git a/fs/minix.c b/fs/minix.c
index 0b7a49e16a3565bc772828bbae3a25a18aecd09e..a856e38c4bc436d5529243adbb2f93f02a6c09b7 100644 (file)
--- a/fs/minix.c
+++ b/fs/minix.c
@@ -311,7 +311,7 @@ grub_minix_lookup_symlink (struct grub_minix_data *data, int ino)
 
   grub_minix_find_file (data, symlink);
   if (grub_errno)
-    grub_error (grub_errno, "can not follow symlink `%s'", symlink);
+    grub_error (grub_errno, "cannot follow symlink `%s'", symlink);
 
   return grub_errno;
 }

diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index f9c37ed7b839a0b3b0d4f3c1b2fca78807370f6e..a8ba75910ad47dfe33bd7ccd725201972e555779 100644 (file)
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -691,7 +691,7 @@ grub_reiserfs_mount (grub_disk_t disk)
   if (grub_memcmp (data->superblock.magic_string,
                    REISERFS_MAGIC_STRING, sizeof (REISERFS_MAGIC_STRING) - 1))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a reiserfs filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a ReiserFS filesystem");
       goto fail;
     }
   data->disk = disk;
@@ -700,7 +700,7 @@ grub_reiserfs_mount (grub_disk_t disk)
  fail:
   /* Disk is too small to contain a ReiserFS.  */
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not a reiserfs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not a ReiserFS filesystem");
 
   grub_free (data);
   return 0;

diff --git a/fs/sfs.c b/fs/sfs.c
index ec59b73ca306e00c1d4ed01502f25be11d45a694..4f70ad3ec57c155602ce2840d22908fb309a99d2 100644 (file)
--- a/fs/sfs.c
+++ b/fs/sfs.c
@@ -279,7 +279,7 @@ grub_sfs_mount (grub_disk_t disk)
   /* Make sure this is a sfs filesystem.  */
   if (grub_strncmp ((char *) (data->rblock.header.magic), "SFS", 4))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a sfs filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a SFS filesystem");
       goto fail;
     }
 
@@ -307,7 +307,7 @@ grub_sfs_mount (grub_disk_t disk)
 
  fail:
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not an sfs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not an SFS filesystem");
 
   grub_free (data);
   grub_free (rootobjc_data);

diff --git a/fs/udf.c b/fs/udf.c
index 9dfe431f6c0ca206d9b7011ef0bb8f00ee700fb1..b44fa8a6d265a799cf82fc456e575d7f6b2ec70f 100644 (file)
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -525,7 +525,7 @@ grub_udf_mount (grub_disk_t disk)
       if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
                          sizeof (struct grub_udf_vrs), &vrs))
        {
-         grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+         grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
          goto fail;
        }
 
@@ -539,7 +539,7 @@ grub_udf_mount (grub_disk_t disk)
          (grub_memcmp (vrs.magic, GRUB_UDF_STD_IDENT_CDW02, 5)) &&
          (grub_memcmp (vrs.magic, GRUB_UDF_STD_IDENT_TEA01, 5)))
        {
-         grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+         grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
          goto fail;
        }
     }
@@ -552,7 +552,7 @@ grub_udf_mount (grub_disk_t disk)
       if (grub_disk_read (disk, *sblklist << GRUB_UDF_LOG2_BLKSZ, 0,
                          sizeof (struct grub_udf_avdp), &avdp))
        {
-         grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+         grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
          goto fail;
        }
 
@@ -565,7 +565,7 @@ grub_udf_mount (grub_disk_t disk)
       sblklist++;
       if (*sblklist == 0)
        {
-         grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+         grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
          goto fail;
        }
     }
@@ -579,7 +579,7 @@ grub_udf_mount (grub_disk_t disk)
       if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
                          sizeof (struct grub_udf_tag), &tag))
        {
-         grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+         grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
          goto fail;
        }
 
@@ -596,7 +596,7 @@ grub_udf_mount (grub_disk_t disk)
                              sizeof (struct grub_udf_pd),
                              &data->pds[data->npd]))
            {
-             grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+             grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
              goto fail;
            }
 
@@ -612,7 +612,7 @@ grub_udf_mount (grub_disk_t disk)
                              sizeof (struct grub_udf_lvd),
                              &data->lvd))
            {
-             grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+             grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
              goto fail;
            }
 
@@ -675,7 +675,7 @@ grub_udf_mount (grub_disk_t disk)
   if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
                      sizeof (struct grub_udf_fileset), &root_fs))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not an udf filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
       goto fail;
     }
 

diff --git a/fs/ufs.c b/fs/ufs.c
index 6d3117d5f563583b91279e45ba82f79718a3becc..f95a6e12e55db1878479fc0cd71626f706169ecf 100644 (file)
--- a/fs/ufs.c
+++ b/fs/ufs.c
@@ -415,7 +415,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
 
   grub_ufs_find_file (data, symlink);
   if (grub_errno)
-    grub_error (grub_errno, "can not follow symlink `%s'", symlink);
+    grub_error (grub_errno, "cannot follow symlink `%s'", symlink);
 
   return grub_errno;
 }

diff --git a/fs/xfs.c b/fs/xfs.c
index d627ea9f8eb9e889dc019d8ecae87849862d21d6..c15ec7341d94c50a2fa7503a67c0567fc2e45816 100644 (file)
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -290,7 +290,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
   else
     {
       grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                 "xfs does not support inode format %d yet",
+                 "XFS does not support inode format %d yet",
                  node->inode.format);
       return 0;
     }
@@ -567,7 +567,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 
     default:
       grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                 "xfs does not support inode format %d yet",
+                 "XFS does not support inode format %d yet",
                  diro->inode.format);
     }
   return 0;
@@ -590,7 +590,7 @@ grub_xfs_mount (grub_disk_t disk)
 
   if (grub_strncmp ((char *) (data->sblock.magic), "XFSB", 4))
     {
-      grub_error (GRUB_ERR_BAD_FS, "not a xfs filesystem");
+      grub_error (GRUB_ERR_BAD_FS, "not a XFS filesystem");
       goto fail;
     }
 
@@ -617,7 +617,7 @@ grub_xfs_mount (grub_disk_t disk)
  fail:
 
   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
-    grub_error (GRUB_ERR_BAD_FS, "not an xfs filesystem");
+    grub_error (GRUB_ERR_BAD_FS, "not an XFS filesystem");
 
   grub_free (data);
 

diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index fbee68001f8df85fa72c2b50f0c18cb6aa8c0de0..9d755450ed879806e4649ca8d2cfd0ad85616e33 100644 (file)
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -75,10 +75,10 @@ grub_linux_release_mem (void)
   linux_args = 0;
 
   if (linux_addr && grub_ieee1275_release (linux_addr, linux_size))
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can not release memory");
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot release memory");
 
   if (initrd_addr && grub_ieee1275_release (initrd_addr, initrd_size))
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can not release memory");
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot release memory");
 
   linux_addr = 0;
   initrd_addr = 0;
@@ -128,7 +128,7 @@ grub_linux_load32 (grub_elf_t elf)
        break;
     }
   if (found_addr == -1)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "could not claim memory");
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't claim memory");
 
   /* Now load the segments into the area we claimed.  */
   auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
@@ -178,7 +178,7 @@ grub_linux_load64 (grub_elf_t elf)
        break;
     }
   if (found_addr == -1)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "could not claim memory");
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't claim memory");
 
   /* Now load the segments into the area we claimed.  */
   auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
@@ -321,7 +321,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   if (found_addr == -1)
     {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "can not claim memory");
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot claim memory");
       goto fail;
     }
 

diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 887edd27a73b667131dde2de8b7cfcbbeadf14d0..8201108470a622efb0b2e025164c5c8a847959ae 100644 (file)
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -256,12 +256,12 @@ grub_linux_load64 (grub_elf_t elf)
   paddr = alloc_phys (linux_size + off);
   if (paddr == (grub_addr_t) -1)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                      "could not allocate physical memory");
+                      "couldn't allocate physical memory");
   ret = grub_ieee1275_map_physical (paddr, linux_addr - off,
                                    linux_size + off, IEEE1275_MAP_DEFAULT);
   if (ret)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                      "could not map physical memory");
+                      "couldn't map physical memory");
 
   grub_dprintf ("loader", "Loading linux at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n",
                linux_addr, paddr, linux_size);
@@ -405,14 +405,14 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   if (paddr == (grub_addr_t) -1)
     {
       grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                 "could not allocate physical memory");
+                 "couldn't allocate physical memory");
       goto fail;
     }
   ret = grub_ieee1275_map_physical (paddr, addr, size, IEEE1275_MAP_DEFAULT);
   if (ret)
     {
       grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                 "could not map physical memory");
+                 "couldn't map physical memory");
       goto fail;
     }
 

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 1958308c346cb7d73745426b943155ddd7b02094..ebf5142d4e748b8194361e43a113c4aa3b507772 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -259,7 +259,7 @@ probe (const char *path, char *device_name)
              grub_util_info ("reading %s via GRUB facilities", grub_path);
              file = grub_file_open (grub_path);
              if (! file)
-               grub_util_error ("can not open %s via GRUB facilities", grub_path);
+               grub_util_error ("cannot open %s via GRUB facilities", grub_path);
              filebuf_via_grub = xmalloc (file->size);
              grub_file_read (file, filebuf_via_grub, file->size);
 

diff --git a/util/misc.c b/util/misc.c
index 5896da0c883d654c62456d9f99fbb8bc0dffb87e..6aa92fb643b8ca2c7dafc3206cf4a1962611ec3c 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -504,7 +504,7 @@ make_system_path_relative_to_its_root (const char *path)
   free (p);
 
   if (stat (buf, &st) < 0)
-    grub_util_error ("can not stat %s: %s", buf, strerror (errno));
+    grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
 
   buf2 = strdup (buf);
   num = st.st_dev;
@@ -523,7 +523,7 @@ make_system_path_relative_to_its_root (const char *path)
        *++p = 0;
 
       if (stat (buf, &st) < 0)
-       grub_util_error ("can not stat %s: %s", buf, strerror (errno));
+       grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
 
       /* buf is another filesystem; we found it.  */
       if (st.st_dev != num)