incubator-mynewt-larva git commit: Have flash_area_to_nffs_desc terminate the returned array with 0 length entry, as that's how nffs_detect() expects it's arg to be.

[ma...@apache.org]

Repository: incubator-mynewt-larva
Updated Branches:
  refs/heads/master dde460fe6 -> 97acf08a6


Have flash_area_to_nffs_desc terminate the returned array with
0 length entry, as that's how nffs_detect() expects it's arg to be.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/97acf08a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/97acf08a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/97acf08a

Branch: refs/heads/master
Commit: 97acf08a687c76414f9ca718d99cfd3c19539005
Parents: dde460f
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Dec 4 15:59:38 2015 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Dec 4 15:59:38 2015 -0800

----------------------------------------------------------------------
 libs/util/src/flash_map.c | 1 +
 project/boot/src/boot.c   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/97acf08a/libs/util/src/flash_map.c
----------------------------------------------------------------------
diff --git a/libs/util/src/flash_map.c b/libs/util/src/flash_map.c
index 9493a0d..81d0f22 100644
--- a/libs/util/src/flash_map.c
+++ b/libs/util/src/flash_map.c
@@ -144,6 +144,7 @@ flash_area_to_nffs_desc(int idx, int *cnt, struct nffs_area_desc *nad)
             move_on = 1;
         }
     }
+    nad[*cnt].nad_length = 0;
     return 0;
 }
 #endif /* NFFS_PRESENT */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/97acf08a/project/boot/src/boot.c
----------------------------------------------------------------------
diff --git a/project/boot/src/boot.c b/project/boot/src/boot.c
index 454e8c1..bda0185 100755
--- a/project/boot/src/boot.c
+++ b/project/boot/src/boot.c
@@ -74,7 +74,6 @@ main(void)
     rc = flash_area_to_nffs_desc(FLASH_AREA_NFFS, &cnt, &descs[total]);
     assert(rc == 0);
     total += cnt;
-    descs[total].nad_length = 0;
 
     nffs_config.nc_num_inodes = 50;
     nffs_config.nc_num_blocks = 50;