From d85c432278893ce8965184a02a9407582c50d578 Mon Sep 17 00:00:00 2001 From: Abdelatif Guettouche Date: Wed, 10 Mar 2021 21:13:31 +0100 Subject: [PATCH] Few typos fixes in binfmt and libc/machine. Signed-off-by: Abdelatif Guettouche --- binfmt/Kconfig | 6 +++--- binfmt/binfmt.h | 2 +- binfmt/binfmt_copyargv.c | 2 +- binfmt/binfmt_dumpmodule.c | 9 +++++---- binfmt/libelf/Kconfig | 6 +++--- libs/libc/machine/arm/arm/arch_elf.c | 2 +- libs/libc/machine/arm/armv6-m/arch_elf.c | 2 +- libs/libc/machine/arm/armv7-a/arch_elf.c | 2 +- libs/libc/machine/arm/armv7-m/arch_elf.c | 2 +- libs/libc/machine/arm/armv7-r/arch_elf.c | 2 +- libs/libc/machine/arm/armv8-m/arch_elf.c | 2 +- libs/libc/machine/risc-v/common/arch_elf.c | 2 +- libs/libc/machine/sim/arch_elf.c | 2 +- libs/libc/machine/sim/arch_elf64.c | 2 +- libs/libc/machine/x86/arch_elf.c | 2 +- libs/libc/machine/xtensa/arch_elf.c | 2 +- 16 files changed, 24 insertions(+), 23 deletions(-) diff --git a/binfmt/Kconfig b/binfmt/Kconfig index 15e878af37..fff34e5275 100644 --- a/binfmt/Kconfig +++ b/binfmt/Kconfig @@ -8,7 +8,7 @@ config BINFMT_DISABLE default n ---help--- By default, support for loadable binary formats is built. This logic - may be suppressed be defining this setting. + may be suppressed by defining this setting. if !BINFMT_DISABLE @@ -64,7 +64,7 @@ config BINFMT_CONSTRUCTORS default n depends on HAVE_CXX && SCHED_STARTHOOK && ELF ---help--- - Build in support for C++ constructors in loaded modules. Currently + Built-in support for C++ constructors in loaded modules. Currently only support for ELF binary formats. config SYMTAB_ORDEREDBYNAME @@ -73,5 +73,5 @@ config SYMTAB_ORDEREDBYNAME ---help--- Select if the symbol table is ordered by symbol name. In this case, the logic can perform faster lookups using a binary search. - Otherwise, the symbol table is assumed to be un-ordered an only + Otherwise, the symbol table is assumed to be un-ordered and only slow, linear searches are supported. diff --git a/binfmt/binfmt.h b/binfmt/binfmt.h index 9461d20447..6a570f5ed4 100644 --- a/binfmt/binfmt.h +++ b/binfmt/binfmt.h @@ -83,7 +83,7 @@ int dump_module(FAR const struct binary_s *bin); * * Description: * In the kernel build, the argv list will likely lie in the caller's - * address environment and, hence, by inaccessible when we switch to the + * address environment and, hence, be inaccessible when we switch to the * address environment of the new process address environment. So we * do not have any real option other than to copy the callers argv[] list. * diff --git a/binfmt/binfmt_copyargv.c b/binfmt/binfmt_copyargv.c index 632aebca62..af429d54c9 100644 --- a/binfmt/binfmt_copyargv.c +++ b/binfmt/binfmt_copyargv.c @@ -54,7 +54,7 @@ * * Description: * In the kernel build, the argv list will likely lie in the caller's - * address environment and, hence, by inaccessible when we switch to the + * address environment and, hence, be inaccessible when we switch to the * address environment of the new process address environment. So we * do not have any real option other than to copy the callers argv[] list. * diff --git a/binfmt/binfmt_dumpmodule.c b/binfmt/binfmt_dumpmodule.c index 2b6b1f92be..488d178a2a 100644 --- a/binfmt/binfmt_dumpmodule.c +++ b/binfmt/binfmt_dumpmodule.c @@ -42,12 +42,13 @@ * Name: dump_module * * Description: - * Load a module into memory and prep it for execution. + * Dump the contents of struct binary_s. + * + * Input Parameters: + * bin - Load structure * * Returned Value: - * This is a NuttX internal function so it follows the convention that - * 0 (OK) is returned on success and a negated errno is returned on - * failure. + * Zero (OK) on success; a negated errno value on failure * ****************************************************************************/ diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig index ff91164e2c..4cbe8c0ac6 100644 --- a/binfmt/libelf/Kconfig +++ b/binfmt/libelf/Kconfig @@ -22,7 +22,7 @@ config ELF_BUFFERSIZE This is an I/O buffer that is used to access the ELF file. Variable length items will need to be read (such as symbol names). This is really just this initial size of the buffer; it will be reallocated as necessary to hold large symbol - names). Default: 32 + names. Default: 32 config ELF_BUFFERINCR int "ELF I/O Buffer Realloc Increment" @@ -53,12 +53,12 @@ config ELF_RELOCATION_BUFFERCOUNT int "ELF Relocation Table Buffer Count" default 256 ---help--- - This is an relocation buffer that is used to store elf relocation table to + This is a relocation buffer that is used to store elf relocation table to reduce access fs. Default: 256 config ELF_SYMBOL_CACHECOUNT int "ELF SYMBOL Table Cache Count" default 256 ---help--- - This is an cache that is used to store elf symbol table to + This is a cache that is used to store elf symbol table to reduce access fs. Default: 256 diff --git a/libs/libc/machine/arm/arm/arch_elf.c b/libs/libc/machine/arm/arm/arch_elf.c index db1b5d22a5..e9dcf94d7d 100644 --- a/libs/libc/machine/arm/arm/arch_elf.c +++ b/libs/libc/machine/arm/arm/arch_elf.c @@ -113,7 +113,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/arm/armv6-m/arch_elf.c b/libs/libc/machine/arm/armv6-m/arch_elf.c index fd4e0d4734..7a43f903c6 100644 --- a/libs/libc/machine/arm/armv6-m/arch_elf.c +++ b/libs/libc/machine/arm/armv6-m/arch_elf.c @@ -104,7 +104,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/arm/armv7-a/arch_elf.c b/libs/libc/machine/arm/armv7-a/arch_elf.c index 0f2d5386c0..d2e00f8c7e 100644 --- a/libs/libc/machine/arm/armv7-a/arch_elf.c +++ b/libs/libc/machine/arm/armv7-a/arch_elf.c @@ -102,7 +102,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/arm/armv7-m/arch_elf.c b/libs/libc/machine/arm/armv7-m/arch_elf.c index 843497ef56..6c4639c8ae 100644 --- a/libs/libc/machine/arm/armv7-m/arch_elf.c +++ b/libs/libc/machine/arm/armv7-m/arch_elf.c @@ -93,7 +93,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/arm/armv7-r/arch_elf.c b/libs/libc/machine/arm/armv7-r/arch_elf.c index 7b52f4d509..505d2d8ec3 100644 --- a/libs/libc/machine/arm/armv7-r/arch_elf.c +++ b/libs/libc/machine/arm/armv7-r/arch_elf.c @@ -113,7 +113,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/arm/armv8-m/arch_elf.c b/libs/libc/machine/arm/armv8-m/arch_elf.c index a70f100830..aa4ceae685 100644 --- a/libs/libc/machine/arm/armv8-m/arch_elf.c +++ b/libs/libc/machine/arm/armv8-m/arch_elf.c @@ -93,7 +93,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/risc-v/common/arch_elf.c b/libs/libc/machine/risc-v/common/arch_elf.c index 46ac192251..1c25e97df2 100644 --- a/libs/libc/machine/risc-v/common/arch_elf.c +++ b/libs/libc/machine/risc-v/common/arch_elf.c @@ -251,7 +251,7 @@ bool up_checkarch(FAR const Elf_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/sim/arch_elf.c b/libs/libc/machine/sim/arch_elf.c index 6cdbe3e5c9..c599564190 100644 --- a/libs/libc/machine/sim/arch_elf.c +++ b/libs/libc/machine/sim/arch_elf.c @@ -84,7 +84,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *hdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/sim/arch_elf64.c b/libs/libc/machine/sim/arch_elf64.c index f09d644f86..37086bf760 100644 --- a/libs/libc/machine/sim/arch_elf64.c +++ b/libs/libc/machine/sim/arch_elf64.c @@ -121,7 +121,7 @@ bool up_checkarch(FAR const Elf64_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/x86/arch_elf.c b/libs/libc/machine/x86/arch_elf.c index b8dc3a9633..f3fadfaecc 100644 --- a/libs/libc/machine/x86/arch_elf.c +++ b/libs/libc/machine/x86/arch_elf.c @@ -92,7 +92,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *hdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: diff --git a/libs/libc/machine/xtensa/arch_elf.c b/libs/libc/machine/xtensa/arch_elf.c index 7d63840507..504b238c79 100644 --- a/libs/libc/machine/xtensa/arch_elf.c +++ b/libs/libc/machine/xtensa/arch_elf.c @@ -109,7 +109,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr) * Name: up_relocate and up_relocateadd * * Description: - * Perform on architecture-specific ELF relocation. Every architecture + * Perform an architecture-specific ELF relocation. Every architecture * that uses the ELF loader must provide this function. * * Input Parameters: