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

Typo fixes in comments and variable names.

Browse source
This commit is contained in:
proski 2007-12-30 08:52:06 +00:00
parent c3c20931a9
commit cc85c3c340
39 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
disk/raid.c
View file

@ -162,7 +162,7 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector,
read_size = size; read_size = size;
/* Check whether the sector was aligned on a chunk size /* Check whether the sector was aligned on a chunk size
bounday. If this isn't the case, it's the first read boundary. If this isn't the case, it's the first read
and the next read should be set back to start of the and the next read should be set back to start of the
boundary. */ boundary. */
grub_divmod64 (read_sector, array->chunk_size, &i); grub_divmod64 (read_sector, array->chunk_size, &i);
@ -282,7 +282,7 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector,
read_size = size; read_size = size;
/* Check whether the sector was aligned on a chunk size /* Check whether the sector was aligned on a chunk size
bounday. If this isn't the case, it's the first read boundary. If this isn't the case, it's the first read
and the next read should be set back to start of the and the next read should be set back to start of the
boundary. */ boundary. */
grub_divmod64 (read_sector, array->chunk_size, &i); grub_divmod64 (read_sector, array->chunk_size, &i);

8
fs/ext2.c
View file

@ -21,7 +21,7 @@
#define EXT2_MAGIC 0xEF53 #define EXT2_MAGIC 0xEF53
/* Amount of indirect blocks in an inode. */ /* Amount of indirect blocks in an inode. */
#define INDIRECT_BLOCKS 12 #define INDIRECT_BLOCKS 12
/* Maximum lenght of a pathname. */ /* Maximum length of a pathname. */
#define EXT2_PATH_MAX 4096 #define EXT2_PATH_MAX 4096
/* Maximum nesting of symlinks, used to prevent a loop. */ /* Maximum nesting of symlinks, used to prevent a loop. */
#define EXT2_MAX_SYMLINKCNT 8 #define EXT2_MAX_SYMLINKCNT 8
@ -146,7 +146,7 @@ struct grub_ext2_inode
grub_uint32_t dir_blocks[INDIRECT_BLOCKS]; grub_uint32_t dir_blocks[INDIRECT_BLOCKS];
grub_uint32_t indir_block; grub_uint32_t indir_block;
grub_uint32_t double_indir_block; grub_uint32_t double_indir_block;
grub_uint32_t tripple_indir_block; grub_uint32_t triple_indir_block;
} blocks; } blocks;
char symlink[60]; char symlink[60];
}; };
@ -251,11 +251,11 @@ grub_ext2_read_block (grub_fshelp_node_t node, int fileblock)
blknr = grub_le_to_cpu32 (indir[rblock % perblock]); blknr = grub_le_to_cpu32 (indir[rblock % perblock]);
} }
/* Tripple indirect. */ /* triple indirect. */
else else
{ {
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"ext2fs doesn't support tripple indirect blocks"); "ext2fs doesn't support triple indirect blocks");
blknr = -1; blknr = -1;
} }

2
fs/hfs.c
View file

@ -43,7 +43,7 @@ enum
GRUB_HFS_FILETYPE_FILE = 2 GRUB_HFS_FILETYPE_FILE = 2
}; };
/* A node desciptor. This is the header of every node. */ /* A node descriptor. This is the header of every node. */
struct grub_hfs_node struct grub_hfs_node
{ {
grub_uint32_t next; grub_uint32_t next;

12
fs/hfsplus.c
View file

@ -303,7 +303,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, int fileblock)
blk = grub_hfsplus_find_block (extents, &blksleft); blk = grub_hfsplus_find_block (extents, &blksleft);
/* The previous iteration of this loop allocated memory. The /* The previous iteration of this loop allocated memory. The
code above used this memory, it can be free'ed now. */ code above used this memory, it can be freed now. */
grub_free (nnode); grub_free (nnode);
nnode = 0; nnode = 0;
@ -505,7 +505,7 @@ grub_hfsplus_cmp_catkey (struct grub_hfsplus_key *keya,
if (diff) if (diff)
return diff; return diff;
/* Change the filename in keya so the endianess is correct. */ /* Change the filename in keya so the endianness is correct. */
for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++) for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++)
catkey_a->name[i] = grub_be_to_cpu16 (catkey_a->name[i]); catkey_a->name[i] = grub_be_to_cpu16 (catkey_a->name[i]);
@ -521,7 +521,7 @@ grub_hfsplus_cmp_catkey (struct grub_hfsplus_key *keya,
grub_free (filename); grub_free (filename);
/* The endianess was changed to host format, change it back to /* The endianness was changed to host format, change it back to
whatever it was. */ whatever it was. */
for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++) for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++)
catkey_a->name[i] = grub_cpu_to_be16 (catkey_a->name[i]); catkey_a->name[i] = grub_cpu_to_be16 (catkey_a->name[i]);
@ -606,7 +606,7 @@ grub_hfsplus_btree_iterate_node (struct grub_hfsplus_btree *btree,
/* Lookup the node described by KEY in the B+ Tree BTREE. Compare /* Lookup the node described by KEY in the B+ Tree BTREE. Compare
keys using the function COMPARE_KEYS. When a match is found, keys using the function COMPARE_KEYS. When a match is found,
return the node in MATCHNODE and a pointer to the data in this node return the node in MATCHNODE and a pointer to the data in this node
in KEYOFFSET. MATCHNODE should be free'ed by the caller. */ in KEYOFFSET. MATCHNODE should be freed by the caller. */
static grub_err_t static grub_err_t
grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
struct grub_hfsplus_key_internal *key, struct grub_hfsplus_key_internal *key,
@ -661,7 +661,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
{ {
grub_uint32_t *pointer; grub_uint32_t *pointer;
/* The place where the key could've been found didn't /* The place where the key could have been found didn't
contain the key. This means that the previous match contain the key. This means that the previous match
is the one that should be followed. */ is the one that should be followed. */
if (compare_keys (currkey, key) > 0) if (compare_keys (currkey, key) > 0)
@ -943,7 +943,7 @@ grub_hfsplus_label (grub_device_t device __attribute__((unused))
/* XXX: It's not documented how to read a label. */ /* XXX: It's not documented how to read a label. */
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"reading the label of a HFS+ " "reading the label of a HFS+ "
"partiton is not implemented"); "partition is not implemented");
} }

4
fs/iso9660.c
View file

@ -283,13 +283,13 @@ grub_iso9660_mount (grub_disk_t disk)
/* Test if the SUSP protocol is used on this filesystem. */ /* Test if the SUSP protocol is used on this filesystem. */
if (grub_strncmp ((char *) entry->sig, "SP", 2) == 0) if (grub_strncmp ((char *) entry->sig, "SP", 2) == 0)
{ {
/* The 2nd data byte stored how many bytes are skipped everytime /* The 2nd data byte stored how many bytes are skipped every time
to get to the SUA (System Usage Area). */ to get to the SUA (System Usage Area). */
data->susp_skip = entry->data[2]; data->susp_skip = entry->data[2];
entry = (struct grub_iso9660_susp_entry *) ((char *) entry + entry->len); entry = (struct grub_iso9660_susp_entry *) ((char *) entry + entry->len);
/* Iterate over the entries in the SUA area to detect /* Iterate over the entries in the SUA area to detect
entensions. */ extensions. */
if (grub_iso9660_susp_iterate (data, if (grub_iso9660_susp_iterate (data,
(grub_le_to_cpu32 (data->voldesc.rootdir.first_sector) (grub_le_to_cpu32 (data->voldesc.rootdir.first_sector)
<< GRUB_ISO9660_LOG2_BLKSZ), << GRUB_ISO9660_LOG2_BLKSZ),

2
fs/jfs.c
View file

@ -478,7 +478,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro)
{ {
unsigned int next; unsigned int next;
/* If the inode contains the entrie tree or if this was the last /* If the inode contains the entry tree or if this was the last
node, there is nothing to read. */ node, there is nothing to read. */
if ((diro->inode->file.tree.flags & GRUB_JFS_TREE_LEAF) if ((diro->inode->file.tree.flags & GRUB_JFS_TREE_LEAF)
|| !grub_le_to_cpu64 (diro->dirpage->header.nextb)) || !grub_le_to_cpu64 (diro->dirpage->header.nextb))

2
fs/ufs.c
View file

@ -231,7 +231,7 @@ grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk)
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"ufs does not support tripple indirect blocks"); "ufs does not support triple indirect blocks");
return 0; return 0;
} }

2
include/grub/efi/api.h
View file

@ -711,7 +711,7 @@ struct grub_efi_boot_services
(*reinstall_protocol_interface) (grub_efi_handle_t handle, (*reinstall_protocol_interface) (grub_efi_handle_t handle,
grub_efi_guid_t *protocol, grub_efi_guid_t *protocol,
void *old_interface, void *old_interface,
void *new_inteface); void *new_interface);
grub_efi_status_t grub_efi_status_t
(*uninstall_protocol_interface) (grub_efi_handle_t handle, (*uninstall_protocol_interface) (grub_efi_handle_t handle,

2
include/grub/elf.h
View file

@ -799,7 +799,7 @@ typedef struct
#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */ #define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */
#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */ #define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */
/* Auxialiary version information. */ /* Auxiliary version information. */
typedef struct typedef struct
{ {

16
include/grub/i386/pc/vbe.h
View file

@ -39,8 +39,8 @@
Please refer to VESA BIOS Extension 3.0 Specification for more descriptive Please refer to VESA BIOS Extension 3.0 Specification for more descriptive
meanings of following structures and how they should be used. meanings of following structures and how they should be used.
I have tried to maintain field name comatibility against specification I have tried to maintain field name compatibility against specification
while following naming convetions used in GRUB. */ while following naming conventions used in GRUB. */
typedef grub_uint32_t grub_vbe_farptr_t; typedef grub_uint32_t grub_vbe_farptr_t;
typedef grub_uint32_t grub_vbe_physptr_t; typedef grub_uint32_t grub_vbe_physptr_t;
@ -68,7 +68,7 @@ struct grub_vbe_info_block
struct grub_vbe_mode_info_block struct grub_vbe_mode_info_block
{ {
/* Mandory information for all VBE revisions. */ /* Mandatory information for all VBE revisions. */
grub_uint16_t mode_attributes; grub_uint16_t mode_attributes;
grub_uint8_t win_a_attributes; grub_uint8_t win_a_attributes;
grub_uint8_t win_b_attributes; grub_uint8_t win_b_attributes;
@ -79,7 +79,7 @@ struct grub_vbe_mode_info_block
grub_vbe_farptr_t win_func_ptr; grub_vbe_farptr_t win_func_ptr;
grub_uint16_t bytes_per_scan_line; grub_uint16_t bytes_per_scan_line;
/* Mandory information for VBE 1.2 and above. */ /* Mandatory information for VBE 1.2 and above. */
grub_uint16_t x_resolution; grub_uint16_t x_resolution;
grub_uint16_t y_resolution; grub_uint16_t y_resolution;
grub_uint8_t x_char_size; grub_uint8_t x_char_size;
@ -103,12 +103,12 @@ struct grub_vbe_mode_info_block
grub_uint8_t rsvd_field_position; grub_uint8_t rsvd_field_position;
grub_uint8_t direct_color_mode_info; grub_uint8_t direct_color_mode_info;
/* Mandory information for VBE 2.0 and above. */ /* Mandatory information for VBE 2.0 and above. */
grub_vbe_physptr_t phys_base_addr; grub_vbe_physptr_t phys_base_addr;
grub_uint32_t reserved2; grub_uint32_t reserved2;
grub_uint16_t reserved3; grub_uint16_t reserved3;
/* Mandory information for VBE 3.0 and above. */ /* Mandatory information for VBE 3.0 and above. */
grub_uint16_t lin_bytes_per_scan_line; grub_uint16_t lin_bytes_per_scan_line;
grub_uint8_t bnk_number_of_image_pages; grub_uint8_t bnk_number_of_image_pages;
grub_uint8_t lin_number_of_image_pages; grub_uint8_t lin_number_of_image_pages;
@ -148,7 +148,7 @@ struct grub_vbe_palette_data
grub_uint8_t blue; grub_uint8_t blue;
grub_uint8_t green; grub_uint8_t green;
grub_uint8_t red; grub_uint8_t red;
grub_uint8_t aligment; grub_uint8_t alignment;
} __attribute__ ((packed)); } __attribute__ ((packed));
/* Prototypes for kernel real mode thunks. */ /* Prototypes for kernel real mode thunks. */
@ -220,7 +220,7 @@ struct grub_video_render_target
unsigned int height; unsigned int height;
} viewport; } viewport;
/* Indicates wether the data has been allocated by us and must be freed /* Indicates whether the data has been allocated by us and must be freed
when render target is destroyed. */ when render target is destroyed. */
int is_allocated; int is_allocated;

2
include/grub/i386/time.h
View file

@ -22,7 +22,7 @@
static __inline void static __inline void
grub_cpu_idle (void) grub_cpu_idle (void)
{ {
/* FIXME: this can't work untill we handle interrupts. */ /* FIXME: this can't work until we handle interrupts. */
/* __asm__ __volatile__ ("hlt"); */ /* __asm__ __volatile__ ("hlt"); */
} }

2
include/grub/video.h
View file

@ -22,7 +22,7 @@
#include <grub/err.h> #include <grub/err.h>
#include <grub/types.h> #include <grub/types.h>
/* Video color in hardware dependant format. Users should not assume any /* Video color in hardware dependent format. Users should not assume any
specific coding format. */ specific coding format. */
typedef grub_uint32_t grub_video_color_t; typedef grub_uint32_t grub_video_color_t;

6
io/gzio.c
View file

@ -56,9 +56,9 @@
/* The state stored in filesystem-specific data. */ /* The state stored in filesystem-specific data. */
struct grub_gzio struct grub_gzio
{ {
/* The underlyding file object. */ /* The underlying file object. */
grub_file_t file; grub_file_t file;
/* The offset at which the data starts in the underlyding file. */ /* The offset at which the data starts in the underlying file. */
grub_off_t data_offset; grub_off_t data_offset;
/* The type of current block. */ /* The type of current block. */
int block_type; int block_type;
@ -79,7 +79,7 @@ struct grub_gzio
unsigned long bb; unsigned long bb;
/* The bits in the bit buffer. */ /* The bits in the bit buffer. */
unsigned bk; unsigned bk;
/* Ths sliding window in uncompressed data. */ /* The sliding window in uncompressed data. */
grub_uint8_t slide[WSIZE]; grub_uint8_t slide[WSIZE];
/* Current position in the slide. */ /* Current position in the slide. */
unsigned wp; unsigned wp;

2
kern/env.c
View file

@ -53,7 +53,7 @@ grub_env_hashval (const char *s)
{ {
unsigned int i = 0; unsigned int i = 0;
/* XXX: This can be done much more effecient. */ /* XXX: This can be done much more efficiently. */
while (*s) while (*s)
i += 5 * *(s++); i += 5 * *(s++);

2
kern/i386/pc/startup.S
View file

@ -1089,7 +1089,7 @@ xsmap:
* character and the attribute, and restore the current position. * character and the attribute, and restore the current position.
* *
* The reason why this is so complicated is that there is no easy way to * The reason why this is so complicated is that there is no easy way to
* get the height of the screen, and the TELETYPE OUPUT BIOS call doesn't * get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't
* support setting a background attribute. * support setting a background attribute.
*/ */
FUNCTION(grub_console_real_putchar) FUNCTION(grub_console_real_putchar)

2
kern/misc.c
View file

@ -576,7 +576,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint32_t d, grub_uint32_t *r)
unsigned long long q = 0; unsigned long long q = 0;
unsigned m = 0; unsigned m = 0;
/* Skip the slow computation, if 32-bit arithmetics are possible. */ /* Skip the slow computation if 32-bit arithmetic is possible. */
if (n < 0xffffffff) if (n < 0xffffffff)
{ {
if (r) if (r)

2
kern/mm.c
View file

@ -164,7 +164,7 @@ grub_mm_init_region (void *addr, grub_size_t size)
r->size = (h->size << GRUB_MM_ALIGN_LOG2); r->size = (h->size << GRUB_MM_ALIGN_LOG2);
/* Find where to insert this region. Put a smaller one before bigger ones, /* Find where to insert this region. Put a smaller one before bigger ones,
to prevent fragmentations. */ to prevent fragmentation. */
for (p = &base, q = *p; q; p = &(q->next), q = *p) for (p = &base, q = *p; q; p = &(q->next), q = *p)
if (q->size > r->size) if (q->size > r->size)
break; break;

2
kern/powerpc/ieee1275/cmain.c
View file

@ -88,7 +88,7 @@ grub_ieee1275_find_options (void)
3rd party updates which fix the partition bugs are common, and for 3rd party updates which fix the partition bugs are common, and for
some reason their fixes aren't being merged into trunk. So for some reason their fixes aren't being merged into trunk. So for
example we know that 1.2 and 1.3 are broken, but there's 1.2.99 example we know that 1.2 and 1.3 are broken, but there's 1.2.99
and 1.3.99 which are known good (and appliing this workaround and 1.3.99 which are known good (and applying this workaround
would cause breakage). */ would cause breakage). */
if (!grub_strcmp (tmp, "1.0") if (!grub_strcmp (tmp, "1.0")
|| !grub_strcmp (tmp, "1.1") || !grub_strcmp (tmp, "1.1")

4
kern/powerpc/ieee1275/openfw.c
View file

@ -1,4 +1,4 @@
/* openfw.c -- Open firmware support funtions. */ /* openfw.c -- Open firmware support functions. */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc. * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
@ -159,7 +159,7 @@ grub_err_t grub_available_iterate (int (*hook) (grub_uint64_t, grub_uint64_t))
if (grub_ieee1275_get_property (memory, "available", available, if (grub_ieee1275_get_property (memory, "available", available,
sizeof available, 0)) sizeof available, 0))
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
"Couldn't examine /memory/available propery"); "Couldn't examine /memory/available property");
/* Decode each entry and call `hook'. */ /* Decode each entry and call `hook'. */
i = 0; i = 0;

2
kern/sparc64/ieee1275/openfw.c
View file

@ -1,4 +1,4 @@
/* openfw.c -- Open firmware support funtions. */ /* openfw.c -- Open firmware support functions. */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2003,2004,2005,2007 Free Software Foundation, Inc. * Copyright (C) 2003,2004,2005,2007 Free Software Foundation, Inc.

2
normal/execute.c
View file

@ -231,7 +231,7 @@ grub_script_execute_menuentry (struct grub_script_cmd *cmd)
return grub_errno; return grub_errno;
} }
/* XXX: When this fails, the memory should be free'ed? */ /* XXX: When this fails, the memory should be freed? */
return grub_normal_menu_addentry (title, script, return grub_normal_menu_addentry (title, script,
cmd_menuentry->sourcecode); cmd_menuentry->sourcecode);
} }

2
normal/lexer.c
View file

@ -254,7 +254,7 @@ grub_script_yylex2 (YYSTYPE *yylval, struct grub_parser_param *parsestate)
break; break;
/* If the string is not quoted or escaped, stop processing /* If the string is not quoted or escaped, stop processing
when a special token was found. It will be recognised when a special token was found. It will be recognized
next time when this function is called. */ next time when this function is called. */
if (newstate == GRUB_PARSER_STATE_TEXT if (newstate == GRUB_PARSER_STATE_TEXT
&& state->state != GRUB_PARSER_STATE_ESC) && state->state != GRUB_PARSER_STATE_ESC)

2
normal/menu_entry.c
View file

@ -335,7 +335,7 @@ insert_string (struct screen *screen, char *s, int update)
int size; int size;
int orig_num, new_num; int orig_num, new_num;
/* Find a string delimitted by LF. */ /* Find a string delimited by LF. */
p = grub_strchr (s, '\n'); p = grub_strchr (s, '\n');
if (! p) if (! p)
p = s + grub_strlen (s); p = s + grub_strlen (s);

6
normal/parser.y
View file

@ -92,7 +92,7 @@ argument: GRUB_PARSER_TOKEN_VAR
$$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_STR, $1); $$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_STR, $1);
} }
/* XXX: Currently disabled to simplify the parser. This should be /* XXX: Currently disabled to simplify the parser. This should be
parsed by yet another parser for readibility. */ parsed by yet another parser for readability. */
/* | argument GRUB_PARSER_TOKEN_VAR */ /* | argument GRUB_PARSER_TOKEN_VAR */
/* { */ /* { */
/* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); */ /* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); */
@ -163,14 +163,14 @@ commands: command '\n'
change any stuff because it might seem like a fun thing to do! change any stuff because it might seem like a fun thing to do!
Special care was take to make sure the mid-rule actions are Special care was take to make sure the mid-rule actions are
executed on the right moment. So the `commands' rule should be executed on the right moment. So the `commands' rule should be
recognised after executing the `grub_script_mem_record; and before recognized after executing the `grub_script_mem_record; and before
`grub_script_mem_record_stop'. */ `grub_script_mem_record_stop'. */
function: "function" GRUB_PARSER_TOKEN_NAME function: "function" GRUB_PARSER_TOKEN_NAME
{ {
grub_script_lexer_ref (state->lexerstate); grub_script_lexer_ref (state->lexerstate);
} newlines '{' } newlines '{'
{ {
/* The first part of the function was recognised. /* The first part of the function was recognized.
Now start recording the memory usage to store Now start recording the memory usage to store
this function. */ this function. */
state->func_mem = grub_script_mem_record (state); state->func_mem = grub_script_mem_record (state);

6
normal/script.c
View file

@ -24,14 +24,14 @@
/* It is not possible to deallocate the memory when a syntax error was /* It is not possible to deallocate the memory when a syntax error was
found. Because of that it is required to keep track of all memory found. Because of that it is required to keep track of all memory
allocations. The memory is free'ed in case of an error, or allocations. The memory is freed in case of an error, or
assigned to the parsed script when parsing was successful. */ assigned to the parsed script when parsing was successful. */
/* XXX */ /* XXX */
/* In case of the normal malloc, some additional bytes are allocated /* In case of the normal malloc, some additional bytes are allocated
for this datastructure. All reserved memory is stored in a linked for this datastructure. All reserved memory is stored in a linked
list so it can be easily free'ed. The original memory can be found list so it can be easily freed. The original memory can be found
from &mem. */ from &mem. */
struct grub_script_mem struct grub_script_mem
{ {
@ -230,7 +230,7 @@ grub_script_create_cmdmenu (struct grub_parser_param *state,
cmd = grub_script_malloc (state, sizeof (*cmd)); cmd = grub_script_malloc (state, sizeof (*cmd));
cmd->cmd.exec = grub_script_execute_menuentry; cmd->cmd.exec = grub_script_execute_menuentry;
cmd->cmd.next = 0; cmd->cmd.next = 0;
/* XXX: Check if this memory is properly free'ed. */ /* XXX: Check if this memory is properly freed. */
cmd->sourcecode = sourcecode; cmd->sourcecode = sourcecode;
cmd->title = title; cmd->title = title;
cmd->options = options; cmd->options = options;

6
partmap/acorn.c
View file

@ -27,8 +27,8 @@
#define LINUX_SWAP_MAGIC grub_cpu_to_le32 (0xdeafab1e) #define LINUX_SWAP_MAGIC grub_cpu_to_le32 (0xdeafab1e)
#define LINUX_MAP_ENTRIES (512 / 12) #define LINUX_MAP_ENTRIES (512 / 12)
#define NONADFS_PARTITON_TYPE_LINUX 9 #define NONADFS_PARTITION_TYPE_LINUX 9
#define NONADFS_PARTITON_TYPE_MASK 15 #define NONADFS_PARTITION_TYPE_MASK 15
struct grub_acorn_boot_block struct grub_acorn_boot_block
{ {
@ -65,7 +65,7 @@ acorn_partition_map_find (grub_disk_t disk, struct linux_part *m,
if (err) if (err)
return err; return err;
if ((boot.flags & NONADFS_PARTITON_TYPE_MASK) != NONADFS_PARTITON_TYPE_LINUX) if ((boot.flags & NONADFS_PARTITION_TYPE_MASK) != NONADFS_PARTITION_TYPE_LINUX)
goto fail; goto fail;
for (i = 0; i != 0x1ff; ++i) for (i = 0; i != 0x1ff; ++i)

4
partmap/sun.c
View file

@ -110,13 +110,13 @@ sun_partition_map_iterate (grub_disk_t disk,
(char *) &block) == GRUB_ERR_NONE) (char *) &block) == GRUB_ERR_NONE)
{ {
if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic)) if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic))
grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partiton table"); grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
if (! grub_sun_is_valid (&block)) if (! grub_sun_is_valid (&block))
grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum"); grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
/* Maybe another error value would be better, because partition /* Maybe another error value would be better, because partition
table _is_ recognised but invalid. */ table _is_ recognized but invalid. */
for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++) for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++)
{ {
struct grub_sun_partition_descriptor *desc; struct grub_sun_partition_descriptor *desc;

4
term/gfxterm.c
View file

@ -349,7 +349,7 @@ grub_gfxterm_init (void)
/* Try out video mode. */ /* Try out video mode. */
/* If we have 8 or less bits, then assuem that it is indexed color mode. */ /* If we have 8 or less bits, then assume that it is indexed color mode. */
if ((depth <= 8) && (depth != -1)) if ((depth <= 8) && (depth != -1))
flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR; flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
@ -399,7 +399,7 @@ grub_gfxterm_init (void)
{ {
/* No gfxmode variable set, use defaults. */ /* No gfxmode variable set, use defaults. */
/* If we have 8 or less bits, then assuem that it is indexed color mode. */ /* If we have 8 or less bits, then assume that it is indexed color mode. */
if ((depth <= 8) && (depth != -1)) if ((depth <= 8) && (depth != -1))
flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR; flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;

4
term/i386/pc/serial.c
View file

@ -88,7 +88,7 @@ serial_hw_fetch (void)
return -1; return -1;
} }
/* Put a chararacter. */ /* Put a character. */
static void static void
serial_hw_put (const int c) serial_hw_put (const int c)
{ {
@ -273,7 +273,7 @@ serial_hw_init (void)
{ {
unsigned char status = 0; unsigned char status = 0;
/* Turn off the interupt. */ /* Turn off the interrupt. */
grub_outb (0, serial_settings.port + UART_IER); grub_outb (0, serial_settings.port + UART_IER);
/* Set DLAB. */ /* Set DLAB. */

6
term/i386/pc/vesafb.c
View file

@ -54,7 +54,7 @@ struct grub_colored_char
struct grub_virtual_screen struct grub_virtual_screen
{ {
/* Dimensions of the virual screen. */ /* Dimensions of the virtual screen. */
grub_uint32_t width; grub_uint32_t width;
grub_uint32_t height; grub_uint32_t height;
@ -77,7 +77,7 @@ struct grub_virtual_screen
grub_uint8_t fg_color; grub_uint8_t fg_color;
grub_uint8_t bg_color; grub_uint8_t bg_color;
/* Text buffer for virual screen. Contains (columns * rows) number /* Text buffer for virtual screen. Contains (columns * rows) number
of entries. */ of entries. */
struct grub_colored_char *text_buffer; struct grub_colored_char *text_buffer;
}; };
@ -376,7 +376,7 @@ scroll_up (void)
virtual_screen.text_buffer[i].index = 0; virtual_screen.text_buffer[i].index = 0;
} }
/* Scroll frambuffer with one line to up. */ /* Scroll framebuffer with one line to up. */
grub_memmove (framebuffer, grub_memmove (framebuffer,
framebuffer framebuffer
+ bytes_per_scan_line * virtual_screen.char_height, + bytes_per_scan_line * virtual_screen.char_height,

2
util/biosdisk.c
View file

@ -425,7 +425,7 @@ grub_util_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
#ifdef __linux__ #ifdef __linux__
if (sector == 0 && size > 1) if (sector == 0 && size > 1)
{ {
/* Work around a bug in linux's ez remapping. Linux remaps all /* Work around a bug in Linux ez remapping. Linux remaps all
sectors that are read together with the MBR in one read. It sectors that are read together with the MBR in one read. It
should only remap the MBR, so we split the read in two should only remap the MBR, so we split the read in two
parts. -jochen */ parts. -jochen */

2
util/genmoddep.c
View file

@ -257,7 +257,7 @@ main (int argc, char *argv[])
/* First, get defined symbols. */ /* First, get defined symbols. */
read_defined_symbols (stdin); read_defined_symbols (stdin);
/* Second, find the dependecies. */ /* Second, find the dependencies. */
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
FILE *fp; FILE *fp;

2
util/i386/efi/grub-install.in
View file

@ -61,7 +61,7 @@ Install GRUB on your EFI partition.
--no-floppy do not probe any floppy drive --no-floppy do not probe any floppy drive
--recheck probe a device map even if it already exists --recheck probe a device map even if it already exists
grub-install copies GRUB images into the DIR/boot directory specfied by grub-install copies GRUB images into the DIR/boot directory specified by
--root-directory. --root-directory.
Report bugs to <bug-grub@gnu.org>. Report bugs to <bug-grub@gnu.org>.

2
util/i386/pc/grub-install.in
View file

@ -69,7 +69,7 @@ Install GRUB on your drive.
INSTALL_DEVICE can be a GRUB device name or a system device filename. INSTALL_DEVICE can be a GRUB device name or a system device filename.
grub-install copies GRUB images into the DIR/boot directory specfied by grub-install copies GRUB images into the DIR/boot directory specified by
--root-directory, and uses grub-setup to install grub into the boot --root-directory, and uses grub-setup to install grub into the boot
sector. sector.

2
util/powerpc/ieee1275/grub-install.in
View file

@ -65,7 +65,7 @@ Install GRUB on your drive.
--grub-probe=FILE use FILE as grub-probe --grub-probe=FILE use FILE as grub-probe
--no-nvram don't update the boot-device NVRAM variable --no-nvram don't update the boot-device NVRAM variable
grub-install copies GRUB images into the DIR/boot directory specfied by grub-install copies GRUB images into the DIR/boot directory specified by
--root-directory, and uses nvsetenv to set the Open Firmware boot-device --root-directory, and uses nvsetenv to set the Open Firmware boot-device
variable. variable.

4
util/update-grub.in
View file

@ -69,7 +69,7 @@ if test -e ${grub_prefix}/device.map ; then : ; else
grub-mkdevicemap grub-mkdevicemap
fi fi
# Device containing our userland. Typicaly used for root= parameter. # Device containing our userland. Typically used for root= parameter.
GRUB_DEVICE="`grub-probe --target=device /`" GRUB_DEVICE="`grub-probe --target=device /`"
# Filesystem for the device containing our userland. Used for stuff like # Filesystem for the device containing our userland. Used for stuff like
@ -135,7 +135,7 @@ cat << EOF
# #
# DO NOT EDIT THIS FILE # DO NOT EDIT THIS FILE
# #
# It is automaticaly generated by $0 using templates # It is automatically generated by $0 using templates
# from ${update_grub_dir} and settings from ${sysconfdir}/default/grub # from ${update_grub_dir} and settings from ${sysconfdir}/default/grub
# #
EOF EOF

8
video/i386/pc/vbe.c
View file

@ -606,7 +606,7 @@ grub_video_vbe_set_viewport (unsigned int x, unsigned int y,
unsigned int width, unsigned int height) unsigned int width, unsigned int height)
{ {
/* Make sure viewport is withing screen dimensions. If viewport was set /* Make sure viewport is withing screen dimensions. If viewport was set
to be out of the reqion, mark its size as zero. */ to be out of the region, mark its size as zero. */
if (x > active_mode_info.x_resolution) if (x > active_mode_info.x_resolution)
{ {
x = 0; x = 0;
@ -766,7 +766,7 @@ grub_video_vbe_unmap_color (struct grub_video_i386_vbeblit_info * source,
if ((mode_info->mode_type if ((mode_info->mode_type
& GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0) & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0)
{ {
/* If we have out of bounds color, return trasnparent black. */ /* If we have an out-of-bounds color, return transparent black. */
if (color > 255) if (color > 255)
{ {
*red = 0; *red = 0;
@ -958,7 +958,7 @@ grub_video_vbe_blit_glyph (struct grub_font_glyph * glyph,
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
/* NOTE: This function assumes that given coordiantes are within bounds of /* NOTE: This function assumes that given coordinates are within bounds of
handled data. */ handled data. */
static void static void
common_blitter (struct grub_video_i386_vbeblit_info *target, common_blitter (struct grub_video_i386_vbeblit_info *target,
@ -1435,7 +1435,7 @@ grub_video_vbe_create_render_target (struct grub_video_render_target **result,
target->mode_info.bpp = 32; target->mode_info.bpp = 32;
target->mode_info.bytes_per_pixel = 4; target->mode_info.bytes_per_pixel = 4;
target->mode_info.pitch = target->mode_info.bytes_per_pixel * width; target->mode_info.pitch = target->mode_info.bytes_per_pixel * width;
target->mode_info.number_of_colors = 256; /* Emulated paletted. */ target->mode_info.number_of_colors = 256; /* Emulated palette. */
target->mode_info.red_mask_size = 8; target->mode_info.red_mask_size = 8;
target->mode_info.red_field_pos = 0; target->mode_info.red_field_pos = 0;
target->mode_info.green_mask_size = 8; target->mode_info.green_mask_size = 8;

4
video/readers/tga.c
View file

@ -327,7 +327,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
ID from end of file, but we really don't care about that as we are ID from end of file, but we really don't care about that as we are
not going to support developer area & extensions at this point. */ not going to support developer area & extensions at this point. */
/* Read TGA header from begining of file. */ /* Read TGA header from beginning of file. */
if (grub_file_read (file, (char*)&header, sizeof (header)) if (grub_file_read (file, (char*)&header, sizeof (header))
!= sizeof (header)) != sizeof (header))
{ {
@ -440,7 +440,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
} }
} }
/* If there were loading proble, destroy bitmap. */ /* If there was a loading problem, destroy bitmap. */
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
{ {
grub_video_bitmap_destroy (*bitmap); grub_video_bitmap_destroy (*bitmap);

4
video/video.c
View file

@ -20,7 +20,7 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/dl.h> #include <grub/dl.h>
/* The list of video adapters registerd to system. */ /* The list of video adapters registered to system. */
static grub_video_adapter_t grub_video_adapter_list; static grub_video_adapter_t grub_video_adapter_list;
/* Active video adapter. */ /* Active video adapter. */
@ -112,7 +112,7 @@ grub_video_setup (unsigned int width, unsigned int height,
"Can't locate valid adapter for mode"); "Can't locate valid adapter for mode");
} }
/* Restore back to initial mode (where applicaple). */ /* Restore back to initial mode (where applicable). */
grub_err_t grub_err_t
grub_video_restore (void) grub_video_restore (void)
{ {