2009-12-24 Carles Pina i Estany <carles@pina.cat>
* bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in grub_errno calls. * commands/acpi.c: Likewise. * commands/blocklist.c: Likewise. * commands/efi/loadbios.c: Likewise. * commands/i386/pc/drivemap.c: Likewise. * commands/loadenv.c: Likewise. * commands/memrw.c: Likewise. * commands/password.c: Likewise. * commands/videotest.c: Likewise. * disk/ata.c: Likewise. * disk/ata_pthru.c: Likewise. * disk/dmraid_nvidia.c: Likewise. * disk/ieee1275/nand.c: Likewise. * disk/ieee1275/ofdisk.c: Likewise. * disk/loopback.c: Likewise. * disk/lvm.c: Likewise. * disk/mdraid_linux.c: Likewise. * disk/raid.c: Likewise. * disk/raid6_recover.c: Likewise. * disk/scsi.c: Likewise. * efiemu/main.c: Likewise. * efiemu/mm.c: Likewise. * efiemu/pnvram.c: Likewise. * efiemu/symbols.c: Likewise. * font/font.c: Likewise. * fs/cpio.c: Likewise. * fs/hfsplus.c: Likewise. * fs/iso9660.c: Likewise. * fs/jfs.c: Likewise. * fs/minix.c: Likewise. * fs/ntfs.c: Likewise. * fs/ntfscomp.c: Likewise. * fs/reiserfs.c: Likewise. * fs/ufs.c: Likewise. * fs/xfs.c: Likewise. * gettext/gettext.c: Likewise. * include/grub/auth.h: Likewise. * kern/elf.c: Likewise. * kern/file.c: Likewise. * kern/ieee1275/init.c: Likewise. * kern/ieee1275/mmap.c: Likewise. * kern/ieee1275/openfw.c: Likewise. * kern/powerpc/dl.c: Likewise. * kern/sparc64/dl.c: Likewise. * lib/arg.c: Likewise. * loader/i386/bsd.c: Likewise. * loader/i386/bsdXX.c: Likewise. * loader/i386/efi/linux.c: Likewise. * loader/i386/efi/xnu.c: Likewise. * loader/i386/ieee1275/linux.c: Likewise. * loader/i386/linux.c: Likewise. * loader/i386/multiboot.c: Likewise. * loader/i386/pc/linux.c: Likewise. * loader/i386/pc/multiboot2.c: Likewise. * loader/i386/xnu.c: Likewise. * loader/ieee1275/multiboot2.c: Likewise. * loader/macho.c: Likewise. * loader/machoXX.c: Likewise. * loader/multiboot2.c: Likewise. * loader/multiboot_loader.c: Likewise. * loader/powerpc/ieee1275/linux.c: Likewise. * loader/sparc64/ieee1275/linux.c: Likewise. * loader/xnu.c: Likewise. * loader/xnu_resume.c: Likewise. * mmap/i386/pc/mmap.c: Likewise. * normal/menu_viewer.c: Likewise. * partmap/acorn.c: Likewise. * partmap/amiga.c: Likewise. * partmap/apple.c: Likewise. * script/lexer.c: Likewise. * term/gfxterm.c: Likewise. * term/i386/pc/serial.c: Likewise. * term/i386/pc/vga.c: Likewise. * term/ieee1275/ofconsole.c: Likewise. * term/terminfo.c: Likewise. * video/bitmap.c: Likewise. * video/efi_gop.c: Likewise. * video/efi_uga.c: Likewise. * video/fb/video_fb.c: Likewise. * video/i386/pc/vbe.c: Likewise. * video/readers/tga.c: Likewise. * video/video.c: Likewise.
This commit is contained in:
parent
a2c1332b70
commit
7fd0baee0f
83 changed files with 388 additions and 302 deletions
|
@ -88,7 +88,7 @@ grub_cpio_find_file (struct grub_cpio_data *data, char **name,
|
|||
return grub_errno;
|
||||
|
||||
if (hd.magic != MAGIC_BCPIO)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Invalid cpio archive");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "invalid cpio archive");
|
||||
|
||||
data->size = (((grub_uint32_t) hd.filesize_1) << 16) + hd.filesize_2;
|
||||
|
||||
|
@ -130,7 +130,7 @@ grub_cpio_find_file (struct grub_cpio_data *data, char **name,
|
|||
}
|
||||
|
||||
if (grub_memcmp (hd.magic, MAGIC_USTAR, sizeof (MAGIC_USTAR) - 1))
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Invalid tar archive");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "invalid tar archive");
|
||||
|
||||
if ((*name = grub_strdup (hd.name)) == NULL)
|
||||
return grub_errno;
|
||||
|
|
|
@ -653,7 +653,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
|
|||
btree->nodesize, (char *) node) <= 0)
|
||||
{
|
||||
grub_free (node);
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Couldn't read i-node.");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "couldn't read i-node");
|
||||
}
|
||||
|
||||
nodedesc = (struct grub_hfsplus_btnode *) node;
|
||||
|
|
|
@ -832,7 +832,7 @@ grub_iso9660_uuid (grub_device_t device, char **uuid)
|
|||
&& ! data->voldesc.modified.second[0] && ! data->voldesc.modified.second[1]
|
||||
&& ! data->voldesc.modified.hundredth[0] && ! data->voldesc.modified.hundredth[1])
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_NUMBER, "No creation date in filesystem to generate UUID.");
|
||||
grub_error (GRUB_ERR_BAD_NUMBER, "no creation date in filesystem to generate UUID");
|
||||
*uuid = NULL;
|
||||
}
|
||||
else
|
||||
|
|
2
fs/jfs.c
2
fs/jfs.c
|
@ -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, "can not follow symlink `%s'", symlink);
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
|
|
@ -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, "can not follow symlink `%s'", symlink);
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
|
24
fs/ntfs.c
24
fs/ntfs.c
|
@ -42,7 +42,7 @@ fixup (struct grub_ntfs_data *data, char *buf, int len, char *magic)
|
|||
|
||||
ss = u16at (buf, 6) - 1;
|
||||
if (ss * (int) data->blocksize != len * GRUB_DISK_SECTOR_SIZE)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Size not match",
|
||||
return grub_error (GRUB_ERR_BAD_FS, "size not match",
|
||||
ss * (int) data->blocksize,
|
||||
len * GRUB_DISK_SECTOR_SIZE);
|
||||
pu = buf + u16at (buf, 4);
|
||||
|
@ -53,7 +53,7 @@ fixup (struct grub_ntfs_data *data, char *buf, int len, char *magic)
|
|||
buf += data->blocksize;
|
||||
pu += 2;
|
||||
if (u16at (buf, 0) != us)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Fixup signature not match");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "fixup signature not match");
|
||||
v16at (buf, 0) = v16at (pu, 0);
|
||||
ss--;
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ find_attr (struct grub_ntfs_attr *at, unsigned char attr)
|
|||
new_pos += u16at (new_pos, 4);
|
||||
}
|
||||
grub_error (GRUB_ERR_BAD_FS,
|
||||
"Can\'t find 0x%X in attribute list",
|
||||
"can\'t find 0x%X in attribute list",
|
||||
(unsigned char) *at->attr_cur);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ find_attr (struct grub_ntfs_attr *at, unsigned char attr)
|
|||
if (read_data (at, pa, at->edat_buf, 0, n, 0, 0))
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS,
|
||||
"Fail to read non-resident attribute list");
|
||||
"fail to read non-resident attribute list");
|
||||
return NULL;
|
||||
}
|
||||
at->attr_nxt = at->edat_buf;
|
||||
|
@ -315,7 +315,7 @@ retry:
|
|||
goto retry;
|
||||
}
|
||||
}
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Run list overflown");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "run list overflown");
|
||||
}
|
||||
run = read_run_data (run + 1, c1, &val, 0); /* length of current VCN */
|
||||
ctx->curr_vcn = ctx->next_vcn;
|
||||
|
@ -369,7 +369,7 @@ read_data (struct grub_ntfs_attr *at, char *pa, char *dest,
|
|||
if (pa[8] == 0)
|
||||
{
|
||||
if (ofs + len > u32at (pa, 0x10))
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Read out of range");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "read out of range");
|
||||
grub_memcpy (dest, pa + u32at (pa, 0x14) + ofs, len);
|
||||
return 0;
|
||||
}
|
||||
|
@ -383,7 +383,7 @@ read_data (struct grub_ntfs_attr *at, char *pa, char *dest,
|
|||
if (ctx->flags & RF_COMP)
|
||||
{
|
||||
if (!cached)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Attribute can\'t be compressed");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "attribute can\'t be compressed");
|
||||
|
||||
if (at->sbuf)
|
||||
{
|
||||
|
@ -502,7 +502,7 @@ read_attr (struct grub_ntfs_attr *at, char *dest, grub_disk_addr_t ofs,
|
|||
else
|
||||
ret =
|
||||
(grub_errno) ? grub_errno : grub_error (GRUB_ERR_BAD_FS,
|
||||
"Attribute not found");
|
||||
"attribute not found");
|
||||
at->attr_cur = save_cur;
|
||||
return ret;
|
||||
}
|
||||
|
@ -513,7 +513,7 @@ read_mft (struct grub_ntfs_data *data, char *buf, grub_uint32_t mftno)
|
|||
if (read_attr
|
||||
(&data->mmft.attr, buf, mftno * ((grub_disk_addr_t) data->mft_size << BLK_SHR),
|
||||
data->mft_size << BLK_SHR, 0, 0))
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Read MFT 0x%X fails", mftno);
|
||||
return grub_error (GRUB_ERR_BAD_FS, "read MFT 0x%X fails", mftno);
|
||||
return fixup (data, buf, data->mft_size, "FILE");
|
||||
}
|
||||
|
||||
|
@ -541,7 +541,7 @@ init_file (struct grub_ntfs_file *mft, grub_uint32_t mftno)
|
|||
|
||||
pa = locate_attr (&mft->attr, mft, AT_DATA);
|
||||
if (pa == NULL)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "No $DATA in MFT 0x%X", mftno);
|
||||
return grub_error (GRUB_ERR_BAD_FS, "no $DATA in MFT 0x%X", mftno);
|
||||
|
||||
if (!pa[8])
|
||||
mft->size = u32at (pa, 0x10);
|
||||
|
@ -664,7 +664,7 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
|
|||
{
|
||||
if ((cur_pos = find_attr (at, AT_INDEX_ROOT)) == NULL)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS, "No $INDEX_ROOT");
|
||||
grub_error (GRUB_ERR_BAD_FS, "no $INDEX_ROOT");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -717,7 +717,7 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
|
|||
if (read_data (at, cur_pos, bmp, 0, bitmap_len, 0, 0))
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS,
|
||||
"Fails to read non-resident $BITMAP");
|
||||
"fails to read non-resident $BITMAP");
|
||||
goto done;
|
||||
}
|
||||
bitmap_len = u32at (cur_pos, 0x30);
|
||||
|
|
|
@ -28,7 +28,7 @@ static grub_err_t
|
|||
decomp_nextvcn (struct grub_ntfs_comp *cc)
|
||||
{
|
||||
if (cc->comp_head >= cc->comp_tail)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Compression block overflown");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "compression block overflown");
|
||||
if (grub_disk_read
|
||||
(cc->disk,
|
||||
(cc->comp_table[cc->comp_head][1] -
|
||||
|
@ -87,7 +87,7 @@ decomp_block (struct grub_ntfs_comp *cc, char *dest)
|
|||
{
|
||||
if (copied > COM_LEN)
|
||||
return grub_error (GRUB_ERR_BAD_FS,
|
||||
"Compression block too large");
|
||||
"compression block too large");
|
||||
|
||||
if (!bits)
|
||||
{
|
||||
|
@ -112,7 +112,7 @@ decomp_block (struct grub_ntfs_comp *cc, char *dest)
|
|||
|
||||
if (!copied)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS, "Context window empty");
|
||||
grub_error (GRUB_ERR_BAD_FS, "nontext window empty");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -150,7 +150,7 @@ decomp_block (struct grub_ntfs_comp *cc, char *dest)
|
|||
{
|
||||
if (cnt != COM_LEN)
|
||||
return grub_error (GRUB_ERR_BAD_FS,
|
||||
"Invalid compression block size");
|
||||
"invalid compression block size");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -187,7 +187,7 @@ read_block (struct grub_ntfs_rlst *ctx, char *buf, int num)
|
|||
{
|
||||
|
||||
if (ctx->comp.comp_head != ctx->comp.comp_tail)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "Invalid compression block");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "invalid compression block");
|
||||
ctx->comp.comp_head = ctx->comp.comp_tail = 0;
|
||||
ctx->comp.cbuf_vcn = ctx->target_vcn;
|
||||
ctx->comp.cbuf_ofs = (ctx->comp.spc << BLK_SHR);
|
||||
|
|
|
@ -998,7 +998,7 @@ grub_reiserfs_open (struct grub_file *file, const char *name)
|
|||
goto fail;
|
||||
if (root.block_number == 0)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS, "Unable to find root item");
|
||||
grub_error (GRUB_ERR_BAD_FS, "unable to find root item");
|
||||
goto fail; /* Should never happen since checked at mount. */
|
||||
}
|
||||
grub_fshelp_find_file (name, &root, &found,
|
||||
|
@ -1014,7 +1014,7 @@ grub_reiserfs_open (struct grub_file *file, const char *name)
|
|||
goto fail;
|
||||
if (info.block_number == 0)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_FS, "Unable to find searched item");
|
||||
grub_error (GRUB_ERR_BAD_FS, "unable to find searched item");
|
||||
goto fail;
|
||||
}
|
||||
entry_version = grub_le_to_cpu16 (info.header.version);
|
||||
|
@ -1289,7 +1289,7 @@ grub_reiserfs_dir (grub_device_t device, const char *path,
|
|||
goto fail;
|
||||
if (root.block_number == 0)
|
||||
{
|
||||
grub_error(GRUB_ERR_BAD_FS, "Root not found");
|
||||
grub_error(GRUB_ERR_BAD_FS, "root not found");
|
||||
goto fail;
|
||||
}
|
||||
grub_fshelp_find_file (path, &root, &found, grub_reiserfs_iterate_dir,
|
||||
|
|
2
fs/ufs.c
2
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, "can not follow symlink `%s'", symlink);
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
|
4
fs/xfs.c
4
fs/xfs.c
|
@ -222,7 +222,7 @@ grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
|
|||
return grub_errno;
|
||||
|
||||
if (grub_strncmp ((char *) inode->magic, "IN", 2))
|
||||
return grub_error (GRUB_ERR_BAD_FS, "not a correct XFS inode.\n");
|
||||
return grub_error (GRUB_ERR_BAD_FS, "not a correct XFS inode");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -273,7 +273,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
|
|||
if (grub_strncmp ((char *) leaf->magic, "BMAP", 4))
|
||||
{
|
||||
grub_free (leaf);
|
||||
grub_error (GRUB_ERR_BAD_FS, "not a correct XFS BMAP node.\n");
|
||||
grub_error (GRUB_ERR_BAD_FS, "not a correct XFS BMAP node");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue