summaryrefslogtreecommitdiff
path: root/nuttx/binfmt
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
commit70b6bb22af51defd713adfd452309f32f0e523aa (patch)
treeb483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/binfmt
parent3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff)
downloadnuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz
nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2
nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip
More trailing whilespace removal
Diffstat (limited to 'nuttx/binfmt')
-rw-r--r--nuttx/binfmt/Makefile4
-rw-r--r--nuttx/binfmt/binfmt_exepath.c2
-rw-r--r--nuttx/binfmt/binfmt_loadmodule.c2
-rw-r--r--nuttx/binfmt/binfmt_schedunload.c2
-rw-r--r--nuttx/binfmt/binfmt_unloadmodule.c2
-rw-r--r--nuttx/binfmt/builtin.c2
-rw-r--r--nuttx/binfmt/libelf/Make.defs2
-rw-r--r--nuttx/binfmt/libelf/libelf_bind.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_ctors.c4
-rw-r--r--nuttx/binfmt/libelf/libelf_dtors.c4
-rw-r--r--nuttx/binfmt/libelf/libelf_init.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_iobuffer.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_sections.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_unload.c2
-rw-r--r--nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld2
-rw-r--r--nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld2
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_addrenv.c4
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_bind.c2
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_init.c4
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_load.c2
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_verify.c4
21 files changed, 27 insertions, 27 deletions
diff --git a/nuttx/binfmt/Makefile b/nuttx/binfmt/Makefile
index 2f692beb1..4e4ad931a 100644
--- a/nuttx/binfmt/Makefile
+++ b/nuttx/binfmt/Makefile
@@ -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 .
diff --git a/nuttx/binfmt/binfmt_exepath.c b/nuttx/binfmt/binfmt_exepath.c
index 4fd7ad918..5da242b4c 100644
--- a/nuttx/binfmt/binfmt_exepath.c
+++ b/nuttx/binfmt/binfmt_exepath.c
@@ -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.
diff --git a/nuttx/binfmt/binfmt_loadmodule.c b/nuttx/binfmt/binfmt_loadmodule.c
index f5e0f6003..8db96a49b 100644
--- a/nuttx/binfmt/binfmt_loadmodule.c
+++ b/nuttx/binfmt/binfmt_loadmodule.c
@@ -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;
diff --git a/nuttx/binfmt/binfmt_schedunload.c b/nuttx/binfmt/binfmt_schedunload.c
index 8ccca8a00..7e7fa471f 100644
--- a/nuttx/binfmt/binfmt_schedunload.c
+++ b/nuttx/binfmt/binfmt_schedunload.c
@@ -318,7 +318,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin)
{
blldbg("ERROR: Failed to remove structure\n");
}
-
+
goto errout;
}
diff --git a/nuttx/binfmt/binfmt_unloadmodule.c b/nuttx/binfmt/binfmt_unloadmodule.c
index 50f8dcb43..0e87d743f 100644
--- a/nuttx/binfmt/binfmt_unloadmodule.c
+++ b/nuttx/binfmt/binfmt_unloadmodule.c
@@ -153,7 +153,7 @@ int unload_module(FAR const struct binary_s *binp)
int ret;
#endif
int i;
-
+
if (binp)
{
/* Execute C++ desctructors */
diff --git a/nuttx/binfmt/builtin.c b/nuttx/binfmt/builtin.c
index e492f72e5..eb838db92 100644
--- a/nuttx/binfmt/builtin.c
+++ b/nuttx/binfmt/builtin.c
@@ -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
diff --git a/nuttx/binfmt/libelf/Make.defs b/nuttx/binfmt/libelf/Make.defs
index 93d95a23c..670ad01fa 100644
--- a/nuttx/binfmt/libelf/Make.defs
+++ b/nuttx/binfmt/libelf/Make.defs
@@ -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
diff --git a/nuttx/binfmt/libelf/libelf_bind.c b/nuttx/binfmt/libelf/libelf_bind.c
index ccdb5108e..8fd52a5e6 100644
--- a/nuttx/binfmt/libelf/libelf_bind.c
+++ b/nuttx/binfmt/libelf/libelf_bind.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)
{
diff --git a/nuttx/binfmt/libelf/libelf_ctors.c b/nuttx/binfmt/libelf/libelf_ctors.c
index af9c7bba4..0dfe64449 100644
--- a/nuttx/binfmt/libelf/libelf_ctors.c
+++ b/nuttx/binfmt/libelf/libelf_ctors.c
@@ -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;
}
}
diff --git a/nuttx/binfmt/libelf/libelf_dtors.c b/nuttx/binfmt/libelf/libelf_dtors.c
index 638284f0b..5cbba4851 100644
--- a/nuttx/binfmt/libelf/libelf_dtors.c
+++ b/nuttx/binfmt/libelf/libelf_dtors.c
@@ -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;
}
}
diff --git a/nuttx/binfmt/libelf/libelf_init.c b/nuttx/binfmt/libelf/libelf_init.c
index fa4b7983c..0e0cf8b35 100644
--- a/nuttx/binfmt/libelf/libelf_init.c
+++ b/nuttx/binfmt/libelf/libelf_init.c
@@ -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 */
diff --git a/nuttx/binfmt/libelf/libelf_iobuffer.c b/nuttx/binfmt/libelf/libelf_iobuffer.c
index b2d54b3ca..14a365d69 100644
--- a/nuttx/binfmt/libelf/libelf_iobuffer.c
+++ b/nuttx/binfmt/libelf/libelf_iobuffer.c
@@ -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)
{
diff --git a/nuttx/binfmt/libelf/libelf_sections.c b/nuttx/binfmt/libelf/libelf_sections.c
index c6b9de286..1b749ba8b 100644
--- a/nuttx/binfmt/libelf/libelf_sections.c
+++ b/nuttx/binfmt/libelf/libelf_sections.c
@@ -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",
diff --git a/nuttx/binfmt/libelf/libelf_unload.c b/nuttx/binfmt/libelf/libelf_unload.c
index f19a32e1b..eadc24b15 100644
--- a/nuttx/binfmt/libelf/libelf_unload.c
+++ b/nuttx/binfmt/libelf/libelf_unload.c
@@ -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
diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
index 3e7057be8..5cc33f6b2 100644
--- a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
@@ -33,7 +33,7 @@
*
****************************************************************************/
-MEMORY
+MEMORY
{
ISPACE : ORIGIN = 0x0, LENGTH = 2097152
DSPACE : ORIGIN = 0x0, LENGTH = 2097152
diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
index 71e4399ba..9c5c60b40 100644
--- a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
@@ -33,7 +33,7 @@
*
****************************************************************************/
-MEMORY
+MEMORY
{
ISPACE : ORIGIN = 0x0, LENGTH = 2097152
DSPACE : ORIGIN = 0x0, LENGTH = 2097152
diff --git a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
index 9a7274e1e..a60b3fe31 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
@@ -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
}
diff --git a/nuttx/binfmt/libnxflat/libnxflat_bind.c b/nuttx/binfmt/libnxflat/libnxflat_bind.c
index 816810a46..8e381630e 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_bind.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_bind.c
@@ -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
diff --git a/nuttx/binfmt/libnxflat/libnxflat_init.c b/nuttx/binfmt/libnxflat/libnxflat_init.c
index add645b54..d0b4e1cd4 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_init.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_init.c
@@ -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.
diff --git a/nuttx/binfmt/libnxflat/libnxflat_load.c b/nuttx/binfmt/libnxflat/libnxflat_load.c
index 5f13b577a..886c16147 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_load.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_load.c
@@ -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);
diff --git a/nuttx/binfmt/libnxflat/libnxflat_verify.c b/nuttx/binfmt/libnxflat/libnxflat_verify.c
index 20af5d2f7..e645fdf92 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_verify.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_verify.c
@@ -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",