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

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

Browse source 
* 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.
This commit is contained in:
carles 2009-12-25 01:04:51 +01:00
parent 7fd0baee0f
commit 61ba42be03
21 changed files with 74 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ChangeLog
View file

@ -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> 2009-12-24 Carles Pina i Estany <carles@pina.cat>
* bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in * bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in

2
commands/efi/loadbios.c
View file

@ -160,7 +160,7 @@ grub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),
int size; int size;
if (argc == 0) 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) if (argc > 1)
{ {

2
commands/i386/pc/drivemap.c
View file

@ -308,7 +308,7 @@ install_int13_handler (int noret __attribute__ ((unused)))
GRUB_MACHINE_MEMORY_RESERVED, GRUB_MACHINE_MEMORY_RESERVED,
GRUB_MMAP_MALLOC_LOW); GRUB_MMAP_MALLOC_LOW);
if (! handler_base) 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"); "memory for the int13h handler");
/* Copy int13h handler bundle to reserved area. */ /* Copy int13h handler bundle to reserved area. */

4
disk/ata.c
View file

@ -281,7 +281,7 @@ grub_ata_identify (struct grub_ata_device *dev)
else else
/* Other Error. */ /* Other Error. */
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, 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); 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 || cylinder > dev->cylinders
|| head > dev->heads) || head > dev->heads)
return grub_error (GRUB_ERR_OUT_OF_RANGE, return grub_error (GRUB_ERR_OUT_OF_RANGE,
"sector %d can not be addressed " "sector %d cannot be addressed "
"using CHS addressing", sector); "using CHS addressing", sector);
grub_ata_regset (dev, GRUB_ATA_REG_DISK, (dev->device << 4) | head); grub_ata_regset (dev, GRUB_ATA_REG_DISK, (dev->device << 4) | head);

2
disk/ieee1275/nand.c
View file

@ -67,7 +67,7 @@ grub_nand_open (const char *name, grub_disk_t disk)
} args; } args;
if (! grub_strstr (name, "nand")) 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)); data = grub_malloc (sizeof (*data));
if (! data) if (! data)

8
fs/affs.c
View file

@ -182,14 +182,14 @@ grub_affs_mount (grub_disk_t disk)
/* Make sure this is an affs filesystem. */ /* Make sure this is an affs filesystem. */
if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3)) 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; goto fail;
} }
/* Test if the filesystem is a OFS filesystem. */ /* Test if the filesystem is a OFS filesystem. */
if (! (data->bblock.flags & GRUB_AFFS_FLAG_FFS)) 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; goto fail;
} }
@ -231,7 +231,7 @@ grub_affs_mount (grub_disk_t disk)
} }
if (-checksum != checksumr) 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; goto fail;
} }
blocksize++; blocksize++;
@ -248,7 +248,7 @@ grub_affs_mount (grub_disk_t disk)
fail: fail:
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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 (data);
grub_free (rootblock); grub_free (rootblock);

2
fs/fat.c
View file

@ -338,7 +338,7 @@ grub_fat_mount (grub_disk_t disk)
fail: fail:
grub_free (data); 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; return 0;
} }

4
fs/hfs.c
View file

@ -365,7 +365,7 @@ grub_hfs_mount (grub_disk_t disk)
if (grub_hfs_find_node (data, (char *) &key, data->cat_root, if (grub_hfs_find_node (data, (char *) &key, data->cat_root,
0, (char *) &dir, sizeof (dir)) == 0) 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; goto fail;
} }
@ -379,7 +379,7 @@ grub_hfs_mount (grub_disk_t disk)
grub_free (data); grub_free (data);
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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; return 0;
} }

2
fs/hfsplus.c
View file

@ -502,7 +502,7 @@ grub_hfsplus_mount (grub_disk_t disk)
fail: fail:
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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); grub_free (data);
return 0; return 0;

8
fs/iso9660.c
View file

@ -280,13 +280,13 @@ grub_iso9660_mount (grub_disk_t disk)
sizeof (struct grub_iso9660_primary_voldesc), sizeof (struct grub_iso9660_primary_voldesc),
(char *) &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; goto fail;
} }
if (grub_strncmp ((char *) voldesc.voldesc.magic, "CD001", 5) != 0) 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; goto fail;
} }
@ -315,7 +315,7 @@ grub_iso9660_mount (grub_disk_t disk)
<< GRUB_ISO9660_LOG2_BLKSZ), 0, << GRUB_ISO9660_LOG2_BLKSZ), 0,
sizeof (rootdir), (char *) &rootdir)) 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; goto fail;
} }
@ -331,7 +331,7 @@ grub_iso9660_mount (grub_disk_t disk)
<< GRUB_ISO9660_LOG2_BLKSZ), sua_pos, << GRUB_ISO9660_LOG2_BLKSZ), sua_pos,
sua_size, sua)) 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; goto fail;
} }

6
fs/jfs.c
View file

@ -344,7 +344,7 @@ grub_jfs_mount (grub_disk_t disk)
if (grub_strncmp ((char *) (data->sblock.magic), "JFS1", 4)) 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; goto fail;
} }
@ -363,7 +363,7 @@ grub_jfs_mount (grub_disk_t disk)
grub_free (data); grub_free (data);
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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; return 0;
} }
@ -715,7 +715,7 @@ grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino)
grub_jfs_find_file (data, symlink); grub_jfs_find_file (data, symlink);
if (grub_errno) 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; return grub_errno;
} }

2
fs/minix.c
View file

@ -311,7 +311,7 @@ grub_minix_lookup_symlink (struct grub_minix_data *data, int ino)
grub_minix_find_file (data, symlink); grub_minix_find_file (data, symlink);
if (grub_errno) 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; return grub_errno;
} }

4
fs/reiserfs.c
View file

@ -691,7 +691,7 @@ grub_reiserfs_mount (grub_disk_t disk)
if (grub_memcmp (data->superblock.magic_string, if (grub_memcmp (data->superblock.magic_string,
REISERFS_MAGIC_STRING, sizeof (REISERFS_MAGIC_STRING) - 1)) 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; goto fail;
} }
data->disk = disk; data->disk = disk;
@ -700,7 +700,7 @@ grub_reiserfs_mount (grub_disk_t disk)
fail: fail:
/* Disk is too small to contain a ReiserFS. */ /* Disk is too small to contain a ReiserFS. */
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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); grub_free (data);
return 0; return 0;

4
fs/sfs.c
View file

@ -279,7 +279,7 @@ grub_sfs_mount (grub_disk_t disk)
/* Make sure this is a sfs filesystem. */ /* Make sure this is a sfs filesystem. */
if (grub_strncmp ((char *) (data->rblock.header.magic), "SFS", 4)) 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; goto fail;
} }
@ -307,7 +307,7 @@ grub_sfs_mount (grub_disk_t disk)
fail: fail:
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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 (data);
grub_free (rootobjc_data); grub_free (rootobjc_data);

16
fs/udf.c
View file

@ -525,7 +525,7 @@ grub_udf_mount (grub_disk_t disk)
if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0, if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
sizeof (struct grub_udf_vrs), &vrs)) 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; 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_CDW02, 5)) &&
(grub_memcmp (vrs.magic, GRUB_UDF_STD_IDENT_TEA01, 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; goto fail;
} }
} }
@ -552,7 +552,7 @@ grub_udf_mount (grub_disk_t disk)
if (grub_disk_read (disk, *sblklist << GRUB_UDF_LOG2_BLKSZ, 0, if (grub_disk_read (disk, *sblklist << GRUB_UDF_LOG2_BLKSZ, 0,
sizeof (struct grub_udf_avdp), &avdp)) 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; goto fail;
} }
@ -565,7 +565,7 @@ grub_udf_mount (grub_disk_t disk)
sblklist++; sblklist++;
if (*sblklist == 0) 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; goto fail;
} }
} }
@ -579,7 +579,7 @@ grub_udf_mount (grub_disk_t disk)
if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0, if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
sizeof (struct grub_udf_tag), &tag)) 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; goto fail;
} }
@ -596,7 +596,7 @@ grub_udf_mount (grub_disk_t disk)
sizeof (struct grub_udf_pd), sizeof (struct grub_udf_pd),
&data->pds[data->npd])) &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; goto fail;
} }
@ -612,7 +612,7 @@ grub_udf_mount (grub_disk_t disk)
sizeof (struct grub_udf_lvd), sizeof (struct grub_udf_lvd),
&data->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; goto fail;
} }
@ -675,7 +675,7 @@ grub_udf_mount (grub_disk_t disk)
if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0, if (grub_disk_read (disk, block << GRUB_UDF_LOG2_BLKSZ, 0,
sizeof (struct grub_udf_fileset), &root_fs)) 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; goto fail;
} }

2
fs/ufs.c
View file

@ -415,7 +415,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
grub_ufs_find_file (data, symlink); grub_ufs_find_file (data, symlink);
if (grub_errno) 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; return grub_errno;
} }

8
fs/xfs.c
View file

@ -290,7 +290,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
else else
{ {
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 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); node->inode.format);
return 0; return 0;
} }
@ -567,7 +567,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
default: default:
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 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); diro->inode.format);
} }
return 0; return 0;
@ -590,7 +590,7 @@ grub_xfs_mount (grub_disk_t disk)
if (grub_strncmp ((char *) (data->sblock.magic), "XFSB", 4)) 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; goto fail;
} }
@ -617,7 +617,7 @@ grub_xfs_mount (grub_disk_t disk)
fail: fail:
if (grub_errno == GRUB_ERR_OUT_OF_RANGE) 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); grub_free (data);

10
loader/powerpc/ieee1275/linux.c
View file

@ -75,10 +75,10 @@ grub_linux_release_mem (void)
linux_args = 0; linux_args = 0;
if (linux_addr && grub_ieee1275_release (linux_addr, linux_size)) 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)) 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; linux_addr = 0;
initrd_addr = 0; initrd_addr = 0;
@ -128,7 +128,7 @@ grub_linux_load32 (grub_elf_t elf)
break; break;
} }
if (found_addr == -1) 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. */ /* 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); 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; break;
} }
if (found_addr == -1) 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. */ /* 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); 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) 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; goto fail;
} }

8
loader/sparc64/ieee1275/linux.c
View file

@ -256,12 +256,12 @@ grub_linux_load64 (grub_elf_t elf)
paddr = alloc_phys (linux_size + off); paddr = alloc_phys (linux_size + off);
if (paddr == (grub_addr_t) -1) if (paddr == (grub_addr_t) -1)
return grub_error (GRUB_ERR_OUT_OF_MEMORY, 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, ret = grub_ieee1275_map_physical (paddr, linux_addr - off,
linux_size + off, IEEE1275_MAP_DEFAULT); linux_size + off, IEEE1275_MAP_DEFAULT);
if (ret) if (ret)
return grub_error (GRUB_ERR_OUT_OF_MEMORY, 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", grub_dprintf ("loader", "Loading linux at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n",
linux_addr, paddr, linux_size); linux_addr, paddr, linux_size);
@ -405,14 +405,14 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
if (paddr == (grub_addr_t) -1) if (paddr == (grub_addr_t) -1)
{ {
grub_error (GRUB_ERR_OUT_OF_MEMORY, grub_error (GRUB_ERR_OUT_OF_MEMORY,
"could not allocate physical memory"); "couldn't allocate physical memory");
goto fail; goto fail;
} }
ret = grub_ieee1275_map_physical (paddr, addr, size, IEEE1275_MAP_DEFAULT); ret = grub_ieee1275_map_physical (paddr, addr, size, IEEE1275_MAP_DEFAULT);
if (ret) if (ret)
{ {
grub_error (GRUB_ERR_OUT_OF_MEMORY, grub_error (GRUB_ERR_OUT_OF_MEMORY,
"could not map physical memory"); "couldn't map physical memory");
goto fail; goto fail;
} }

2
util/grub-probe.c
View file

@ -259,7 +259,7 @@ probe (const char *path, char *device_name)
grub_util_info ("reading %s via GRUB facilities", grub_path); grub_util_info ("reading %s via GRUB facilities", grub_path);
file = grub_file_open (grub_path); file = grub_file_open (grub_path);
if (! file) 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); filebuf_via_grub = xmalloc (file->size);
grub_file_read (file, filebuf_via_grub, file->size); grub_file_read (file, filebuf_via_grub, file->size);

4
util/misc.c
View file

@ -504,7 +504,7 @@ make_system_path_relative_to_its_root (const char *path)
free (p); free (p);
if (stat (buf, &st) < 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));
buf2 = strdup (buf); buf2 = strdup (buf);
num = st.st_dev; num = st.st_dev;
@ -523,7 +523,7 @@ make_system_path_relative_to_its_root (const char *path)
*++p = 0; *++p = 0;
if (stat (buf, &st) < 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. */ /* buf is another filesystem; we found it. */
if (st.st_dev != num) if (st.st_dev != num)