Various corrections
cover Various corrections
These are all fairly trivial changes, so I lumped them together.
Glenn
Glenn Washburn (4):
misc: Fix typo
misc: Add space after comma in function argument list
docs: Minor corrections
docs: Add missing assumption
docs/grub-dev.texi | 5 +++-- docs/grub.texi | 4 ++-- grub-core/commands/regexp.c | 2 +- grub-core/kern/misc.c | 14 +++++++------- 4 files changed, 13 insertions(+), 12 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 misc: Fix typo
--- grub-core/commands/regexp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
grub-core/commands/regexp.c +1 -1
@@ -36,7 +36,7 @@ static const struct grub_arg_option options[] = groups with parentheses. These groups are then numbered and you can save some of them in variables. In other programs - those components aree often referenced with + those components are often referenced with back slash, e.g. \1. Compare sed -e 's,\([a-z][a-z]*\),lowercase=\1,g' The whole matching component is saved in VARNAME, not its number.
Signature · 1 line
2.34.1
PATCH 2/4 misc: Add space after comma in function argument list
In reply to Glenn Washburn--- grub-core/kern/misc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
grub-core/kern/misc.c +7 -7
@@ -1004,7 +1004,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,if (c !='%' ) { -write_char (str, &count, max_len,c); +write_char (str, &count, max_len, c);continue ; }
@@ -1052,7 +1052,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,if (c =='%' ) { -write_char (str, &count, max_len,c); +write_char (str, &count, max_len, c); n--;continue ; }
@@ -1102,7 +1102,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,break ;case 'c' : -write_char (str, &count, max_len,curarg &0xff ); +write_char (str, &count, max_len, curarg &0xff );break ;case 'C' :
@@ -1138,10 +1138,10 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, mask =0 ; } -write_char (str, &count, max_len,mask | (code >> shift)); +write_char (str, &count, max_len, mask | (code >> shift));for (shift -=6 ; shift >=0 ; shift -=6 ) -write_char (str, &count, max_len,0x80 | (0x3f & (code >> shift))); +write_char (str, &count, max_len,0x80 | (0x3f & (code >> shift))); }break ;
@@ -1162,7 +1162,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,write_char (str, &count, max_len, zerofill);for (i =0 ; i < len; i++) -write_char (str, &count, max_len,*p++); +write_char (str, &count, max_len, *p++);if (rightfill)while (fill--)
@@ -1172,7 +1172,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,break ;default : -write_char (str, &count, max_len,c); +write_char (str, &count, max_len, c);break ; } }
Signature · 1 line
2.34.1
PATCH 3/4 docs: Minor corrections
In reply to Glenn WashburnWhen referring to initrd16 the link for initrd16 should be used, not a link for initrd. Also, correct the spelling of additionally and add a comma after it to correct its grammatical usage.
--- docs/grub.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
docs/grub.texi +2 -2
@@ -1012,11 +1012,11 @@ is discovered. This is achieved by GRUB loading a specially made small image and passing it as ramdisk to the kernel. This is achieved by commands @command{kfreebsd_module}, @command{knetbsd_module_elf}, @command{kopenbsd_ramdisk}, @command{initrd} (@pxref{initrd}), -@command{initrd16} (@pxref{initrd}), @command{multiboot_module}, +@command{initrd16} (@pxref{initrd16}), @command{multiboot_module}, @command{multiboot2_module} or @command{xnu_ramdisk} depending on the loader. Note that for knetbsd the image must be put inside miniroot.kmod and the whole miniroot.kmod has to be loaded. In -kopenbsd payload this is disabled by default. Aditionally behaviour of +kopenbsd payload this is disabled by default. Additionally, behaviour of initial ramdisk depends on command line options. Several distributors provide the image for this purpose or it's integrated in their standard ramdisk and activated by special option. Consult your kernel and distribution manual for
Signature · 1 line
2.34.1
PATCH 4/4 docs: Add missing assumption
In reply to Glenn WashburnAlso reword a prior sentence to be more clear.
--- docs/grub-dev.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
docs/grub-dev.texi +3 -2
@@ -660,10 +660,11 @@ GDB is started from the @file{grub-core} directory in the GRUB2 build directory. GRUB2 developers have made this more simple by including a GDB script which does much of the setup. This file at @file{grub-core/gdb_grub} of the build directory and is also installed via @command{make install}. -If not building GRUB, the distribution may have a package which installs +When using a pre-built GRUB, the distribution may have a package which installs this GDB script along with debug symbol binaries, such as Debian's @samp{grub-pc-dbg} package. The GDB scripts is intended to by used -like so, assuming: +like so, assuming that @samp{/path/to/script} is the path to the directory +containing the gdb_grub script and debug symbol files: @example cd $(dirname /path/to/script/gdb_grub)
Signature · 1 line
2.34.1
Re: [PATCH 4/4] docs: Add missing assumption
Quoted 29 lines · Glenn Washburn
Also reword a prior sentence to be more clear.
Fixes 5a3d2b4742df (docs: Add debugging chapter to development documentation)Signed-off-by Glenn Washburn <[email protected]>--- docs/grub-dev.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)docs/grub-dev.texi +3
-2@@ -660,10 +660,11 @@ GDB is started from the @file{grub-core} directory in the GRUB2 build directory. GRUB2 developers have made this more simple by including a GDB script which does much of the setup. This file at @file{grub-core/gdb_grub} of the build directory and is also installed via @command{make install}. -If not building GRUB, the distribution may have a package which installs +When using a pre-built GRUB, the distribution may have a package which installs this GDB script along with debug symbol binaries, such as Debian's @samp{grub-pc-dbg} package. The GDB scripts is intended to by used -like so, assuming: +like so, assuming that @samp{/path/to/script} is the path to the directory +containing the gdb_grub script and debug symbol files: @example cd $(dirname /path/to/script/gdb_grub)Signature · 1 line
2.34.1
This patch does not apply on top of my docs fixes from earlier. So one of us will have to rebase, depending on which patch goes in the tree first.
- Oskari
Re: [PATCH 4/4] docs: Add missing assumption
Quoted 25 lines · Oskari Pirhonen
Quoted 24 lines · Glenn Washburn
Also reword a prior sentence to be more clear.
Fixes 5a3d2b4742df (docs: Add debugging chapter to development documentation)Signed-off-by Glenn Washburn <[email protected]>--- docs/grub-dev.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)docs/grub-dev.texi +3
-2@@ -660,10 +660,11 @@ GDB is started from the @file{grub-core} directory in the GRUB2 build directory. GRUB2 developers have made this more simple by including a GDB script which does much of the setup. This file at @file{grub-core/gdb_grub} of the build directory and is also installed via @command{make install}. -If not building GRUB, the distribution may have a package which installs +When using a pre-built GRUB, the distribution may have a package which installs this GDB script along with debug symbol binaries, such as Debian's @samp{grub-pc-dbg} package. The GDB scripts is intended to by used -like so, assuming: +like so, assuming that @samp{/path/to/script} is the path to the directory +containing the gdb_grub script and debug symbol files:
Quoted 9 lines
Quoted 5 lines
docs/grub-dev.texi +0
-1@example cd $(dirname /path/to/script/gdb_grub) --2.34.1
This patch does not apply on top of my docs fixes from earlier. So one of us will have to rebase, depending on which patch goes in the tree first.
Oskari, your patch will go first.
Daniel
Quoted 9 lines · Glenn Washburn
These are all fairly trivial changes, so I lumped them together.
Glenn
Glenn Washburn (4):
misc: Fix typo
misc: Add space after comma in function argument list
docs: Minor corrections
docs: Add missing assumption
For all patches Reviewed-by: Daniel Kiper <[email protected]>...
Daniel