diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-24 20:49:43 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-24 20:49:43 +0000 |
| commit | 38add3698930bde72d1548097b95334f0be449f1 (patch) | |
| tree | 2cf2631940b956446994f95a916d7e6b3fc6f229 | |
| parent | b18f5b7ee48b7df03fadd776282bfe45da88aaeb (diff) | |
| download | nuttx-38add3698930bde72d1548097b95334f0be449f1.tar.gz nuttx-38add3698930bde72d1548097b95334f0be449f1.tar.bz2 nuttx-38add3698930bde72d1548097b95334f0be449f1.zip | |
Fix DEBUG-on compilation errors
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1940 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/binfmt/binfmt_loadmodule.c | 2 | ||||
| -rw-r--r-- | nuttx/binfmt/libnxflat/libnxflat_bind.c | 4 | ||||
| -rw-r--r-- | nuttx/binfmt/libnxflat/libnxflat_load.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/binfmt/binfmt_loadmodule.c b/nuttx/binfmt/binfmt_loadmodule.c index c251f0af7..bad6ca712 100644 --- a/nuttx/binfmt/binfmt_loadmodule.c +++ b/nuttx/binfmt/binfmt_loadmodule.c @@ -90,7 +90,7 @@ int load_module(FAR struct binary_s *bin) int ret; #ifdef CONFIG_DEBUG - if (!filename || !bin) + if (!bin || !bin->filename) { ret = -EINVAL; } diff --git a/nuttx/binfmt/libnxflat/libnxflat_bind.c b/nuttx/binfmt/libnxflat/libnxflat_bind.c index 2afb92f12..86d9f9a20 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_bind.c +++ b/nuttx/binfmt/libnxflat/libnxflat_bind.c @@ -343,7 +343,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, { /* It does.. make sure that exported symbols are provided */ - DEBUGASSERT(symtab && nexports > 0); + DEBUGASSERT(exports && nexports > 0); /* If non-zero, the value of the imported symbol list that we get * from the header is a file offset. We will have to convert this @@ -393,7 +393,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, imports[i].i_funcaddress = (uint32)symbol->sym_value; bvdbg("Bound imported function '%s' to address %08x\n", - symname, imports[i].function_address); + symname, imports[i].i_funcaddress); } } diff --git a/nuttx/binfmt/libnxflat/libnxflat_load.c b/nuttx/binfmt/libnxflat/libnxflat_load.c index 022ad7f7d..f0488bae1 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_load.c +++ b/nuttx/binfmt/libnxflat/libnxflat_load.c @@ -71,7 +71,7 @@ static const char *g_reloctype[] = { g_relocrel32i, g_relocrel32d, - g_relocabs32. + g_relocabs32, g_undefined }; # define RELONAME(rl) g_reloctype[NXFLAT_RELOC_TYPE(rl)] |