From 0ffd3b6c84610350f6880e044a2f64a4f8cf55d9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 25 Jun 2009 12:44:55 +0000 Subject: Make all counts 16-bit git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1946 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/binfmt/libnxflat/libnxflat_bind.c | 2 +- nuttx/binfmt/libnxflat/libnxflat_init.c | 2 +- nuttx/binfmt/nxflat.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nuttx/binfmt') diff --git a/nuttx/binfmt/libnxflat/libnxflat_bind.c b/nuttx/binfmt/libnxflat/libnxflat_bind.c index 1d0c8d661..4489ebfcd 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_bind.c +++ b/nuttx/binfmt/libnxflat/libnxflat_bind.c @@ -220,7 +220,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo) /* From this, we can get the offset to the list of relocation entries */ offset = ntohl(hdr->h_relocstart); - nrelocs = ntohl(hdr->h_reloccount); + nrelocs = ntohs(hdr->h_reloccount); /* The value of the relocation list that we get from the header is a * file offset. We will have to convert this to an offset into the diff --git a/nuttx/binfmt/libnxflat/libnxflat_init.c b/nuttx/binfmt/libnxflat/libnxflat_init.c index 8bc9aef99..6a7a98748 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_init.c +++ b/nuttx/binfmt/libnxflat/libnxflat_init.c @@ -168,7 +168,7 @@ int nxflat_init(const char *filename, struct nxflat_hdr_s *header, */ loadinfo->relocstart = ntohl(header->h_relocstart); - loadinfo->reloccount = ntohl(header->h_reloccount); + loadinfo->reloccount = ntohs(header->h_reloccount); return 0; } diff --git a/nuttx/binfmt/nxflat.c b/nuttx/binfmt/nxflat.c index 8aee2fdd0..534f18cae 100644 --- a/nuttx/binfmt/nxflat.c +++ b/nuttx/binfmt/nxflat.c @@ -123,7 +123,7 @@ static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo) bdbg(" RELOCS:\n"); bdbg(" relocstart: %08lx\n", loadinfo->relocstart); - bdbg(" reloccount: %08lx\n", loadinfo->reloccount); + bdbg(" reloccount: %04lx\n", loadinfo->reloccount); bdbg(" HANDLES:\n"); bdbg(" filfd: %d\n", loadinfo->filfd); -- cgit v1.2.3