mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 14:53:47 +08:00
More trailing whilespace removal
This commit is contained in:
+2
-2
@@ -41,7 +41,7 @@ INCDIROPT = -w
|
||||
endif
|
||||
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(TOPDIR)$(DELIM)sched"}
|
||||
|
||||
# Basic BINFMT source files
|
||||
# Basic BINFMT source files
|
||||
|
||||
BINFMT_ASRCS =
|
||||
BINFMT_CSRCS = binfmt_globals.c binfmt_register.c binfmt_unregister.c
|
||||
@@ -63,7 +63,7 @@ BINFMT_CSRCS += symtab_findorderedbyname.c symtab_findorderedbyvalue.c
|
||||
|
||||
# Add configured binary modules
|
||||
|
||||
VPATH =
|
||||
VPATH =
|
||||
SUBDIRS =
|
||||
DEPPATH = --dep-path .
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ EXEPATH_HANDLE exepath_init(void)
|
||||
*
|
||||
* Input Parameters:
|
||||
* handle - The handle value returned by exepath_init
|
||||
* relpath - The relative path to the file to be found.
|
||||
* relpath - The relative path to the file to be found.
|
||||
*
|
||||
* Returned Value:
|
||||
* On success, a non-NULL pointer to a null-terminated string is provided.
|
||||
|
||||
@@ -94,7 +94,7 @@ static int load_default_priority(FAR struct binary_s *bin)
|
||||
bdbg("ERROR: sched_getparam failed: %d\n", errno);
|
||||
return ERROR;
|
||||
}
|
||||
|
||||
|
||||
/* Save that as the priority of child thread */
|
||||
|
||||
bin->priority = param.sched_priority;
|
||||
|
||||
@@ -318,7 +318,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin)
|
||||
{
|
||||
blldbg("ERROR: Failed to remove structure\n");
|
||||
}
|
||||
|
||||
|
||||
goto errout;
|
||||
}
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ int unload_module(FAR const struct binary_s *binp)
|
||||
int ret;
|
||||
#endif
|
||||
int i;
|
||||
|
||||
|
||||
if (binp)
|
||||
{
|
||||
/* Execute C++ desctructors */
|
||||
|
||||
+1
-1
@@ -128,7 +128,7 @@ static int builtin_loadbinary(struct binary_s *binp)
|
||||
int errval = errno;
|
||||
bdbg("ERROR: %s is not a builtin application\n", filename);
|
||||
return -errval;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* Return the load information. NOTE: that there is no way to configure
|
||||
|
||||
@@ -41,7 +41,7 @@ BINFMT_CSRCS += elf.c
|
||||
|
||||
# ELF library
|
||||
|
||||
BINFMT_CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c
|
||||
BINFMT_CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c
|
||||
BINFMT_CSRCS += libelf_load.c libelf_read.c libelf_sections.c libelf_symbols.c
|
||||
BINFMT_CSRCS += libelf_uninit.c libelf_unload.c libelf_verify.c
|
||||
|
||||
|
||||
@@ -290,7 +290,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
|
||||
for (i = 1; i < loadinfo->ehdr.e_shnum; i++)
|
||||
{
|
||||
/* Get the index to the relocation section */
|
||||
|
||||
|
||||
int infosec = loadinfo->shdr[i].sh_info;
|
||||
if (infosec >= loadinfo->ehdr.e_shnum)
|
||||
{
|
||||
|
||||
@@ -109,7 +109,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
|
||||
|
||||
/* Find the index to the section named ".ctors." NOTE: On old ABI system,
|
||||
* .ctors is the name of the section containing the list of constructors;
|
||||
* On newer systems, the similar section is called .init_array. It is
|
||||
* On newer systems, the similar section is called .init_array. It is
|
||||
* expected that the linker script will force the section name to be ".ctors"
|
||||
* in either case.
|
||||
*/
|
||||
@@ -204,7 +204,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
|
||||
* loaded into memory. Since the .ctors lie in allocated memory, they
|
||||
* will be relocated via the normal mechanism.
|
||||
*/
|
||||
|
||||
|
||||
loadinfo->ctors = (binfmt_ctor_t*)shdr->sh_addr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
|
||||
|
||||
/* Find the index to the section named ".dtors." NOTE: On old ABI system,
|
||||
* .dtors is the name of the section containing the list of destructors;
|
||||
* On newer systems, the similar section is called .fini_array. It is
|
||||
* On newer systems, the similar section is called .fini_array. It is
|
||||
* expected that the linker script will force the section name to be ".dtors"
|
||||
* in either case.
|
||||
*/
|
||||
@@ -204,7 +204,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
|
||||
* loaded into memory. Since the .dtors lie in allocated memory, they
|
||||
* will be relocated via the normal mechanism.
|
||||
*/
|
||||
|
||||
|
||||
loadinfo->dtors = (binfmt_dtor_t*)shdr->sh_addr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
|
||||
{
|
||||
int errval = errno;
|
||||
bdbg("Failed to open ELF binary %s: %d\n", filename, errval);
|
||||
return -errval;
|
||||
return -errval;
|
||||
}
|
||||
|
||||
/* Read the ELF ehdr from offset 0 */
|
||||
|
||||
@@ -83,7 +83,7 @@ int elf_allocbuffer(FAR struct elf_loadinfo_s *loadinfo)
|
||||
if (!loadinfo->iobuffer)
|
||||
{
|
||||
/* No.. allocate one now */
|
||||
|
||||
|
||||
loadinfo->iobuffer = (FAR uint8_t *)kmalloc(CONFIG_ELF_BUFFERSIZE);
|
||||
if (!loadinfo->iobuffer)
|
||||
{
|
||||
|
||||
@@ -265,7 +265,7 @@ int elf_findsection(FAR struct elf_loadinfo_s *loadinfo,
|
||||
bdbg("elf_sectname failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* Check if the name of this section is 'sectname' */
|
||||
|
||||
bvdbg("%d. Comparing \"%s\" and .\"%s\"\n",
|
||||
|
||||
@@ -86,7 +86,7 @@ int elf_unload(struct elf_loadinfo_s *loadinfo)
|
||||
/* Release memory holding the relocated ELF image */
|
||||
|
||||
elf_addrenv_free(loadinfo);
|
||||
|
||||
|
||||
/* Release memory used to hold static constructors and destructors */
|
||||
|
||||
#ifdef CONFIG_BINFMT_CONSTRUCTORS
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
MEMORY
|
||||
MEMORY
|
||||
{
|
||||
ISPACE : ORIGIN = 0x0, LENGTH = 2097152
|
||||
DSPACE : ORIGIN = 0x0, LENGTH = 2097152
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
MEMORY
|
||||
MEMORY
|
||||
{
|
||||
ISPACE : ORIGIN = 0x0, LENGTH = 2097152
|
||||
DSPACE : ORIGIN = 0x0, LENGTH = 2097152
|
||||
|
||||
@@ -150,7 +150,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
|
||||
/* Success... save the fruits of our labor */
|
||||
|
||||
loadinfo->dspace = dspace;
|
||||
dspace->crefs = 1;
|
||||
dspace->crefs = 1;
|
||||
dspace->region = (FAR uint8_t *)vaddr;
|
||||
return OK;
|
||||
|
||||
@@ -172,7 +172,7 @@ errout_with_dspace:
|
||||
}
|
||||
|
||||
loadinfo->dspace = dspace;
|
||||
dspace->crefs = 1;
|
||||
dspace->crefs = 1;
|
||||
return OK;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -251,7 +251,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
|
||||
|
||||
relocs = (FAR struct nxflat_reloc_s *)
|
||||
(offset - loadinfo->isize + loadinfo->dspace->region);
|
||||
bvdbg("isize: %08lx dpsace: %p relocs: %p\n",
|
||||
bvdbg("isize: %08lx dpsace: %p relocs: %p\n",
|
||||
(long)loadinfo->isize, loadinfo->dspace->region, relocs);
|
||||
|
||||
/* All relocations are performed within the D-Space allocation. If
|
||||
|
||||
@@ -113,7 +113,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
|
||||
{
|
||||
int errval = errno;
|
||||
bdbg("Failed to open NXFLAT binary %s: %d\n", filename, errval);
|
||||
return -errval;
|
||||
return -errval;
|
||||
}
|
||||
|
||||
/* Read the NXFLAT header from offset 0 */
|
||||
@@ -143,7 +143,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
|
||||
return -ENOEXEC;
|
||||
}
|
||||
|
||||
/* Save all of the input values in the loadinfo structure
|
||||
/* Save all of the input values in the loadinfo structure
|
||||
* and extract some additional information from the xflat
|
||||
* header. Note that the information in the xflat header is in
|
||||
* network order.
|
||||
|
||||
@@ -195,7 +195,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
|
||||
bdbg("Failed to read .data section: %d\n", ret);
|
||||
goto errout;
|
||||
}
|
||||
|
||||
|
||||
bvdbg("TEXT: %08x Entry point offset: %08x Data offset: %08x\n",
|
||||
loadinfo->ispace, loadinfo->entryoffs, doffset);
|
||||
|
||||
|
||||
@@ -84,11 +84,11 @@ int nxflat_verifyheader(const struct nxflat_hdr_s *header)
|
||||
}
|
||||
|
||||
/* Check the FLT header -- magic number and revision.
|
||||
*
|
||||
*
|
||||
* If the magic number does not match. Just return
|
||||
* silently. This is not our binary.
|
||||
*/
|
||||
|
||||
|
||||
if (strncmp(header->h_magic, NXFLAT_MAGIC, 4) != 0)
|
||||
{
|
||||
bdbg("Unrecognized magic=\"%c%c%c%c\"\n",
|
||||
|
||||
Reference in New Issue
Block a user