[6/7] incubator-mynewt-core git commit: index of scratch area not initialized

[cc...@apache.org]

index of scratch area not initialized

The index of the area used for scratch was uninitialized which incorrectly
caused the first area to be labelled as a scratch area. Yeah, and I have to
change my vim options to stop automatically adding tabs.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/5cc85484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5cc85484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5cc85484

Branch: refs/heads/develop
Commit: 5cc854842791c9dd87fb44639796354ec86d9ec5
Parents: 7b269d5
Author: Peter Snyder <gi...@peterfs.com>
Authored: Sat Jul 2 11:42:03 2016 -0700
Committer: Peter Snyder <gi...@peterfs.com>
Committed: Sat Jul 2 11:42:03 2016 -0700

----------------------------------------------------------------------
 apps/ffs2native/src/main.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5cc85484/apps/ffs2native/src/main.c
----------------------------------------------------------------------
diff --git a/apps/ffs2native/src/main.c b/apps/ffs2native/src/main.c
index edaaa31..570d5af 100644
--- a/apps/ffs2native/src/main.c
+++ b/apps/ffs2native/src/main.c
@@ -376,7 +376,7 @@ print_nffs_flash_V0inode(struct nffs_area_desc *area, uint32_t off)
 
     rc = file_flash_read(area->nad_offset + off, &ndi, sizeof(ndi));
     assert(rc == 0);
-	assert(nffs_hash_id_is_inode(ndi.ndi_id));
+    assert(nffs_hash_id_is_inode(ndi.ndi_id));
 
     memset(filename, 0, sizeof(filename));
     len = min(sizeof(filename) - 1, ndi.ndi_filename_len);
@@ -400,8 +400,8 @@ print_nffs_flash_V0block(struct nffs_area_desc *area, uint32_t off)
 
     rc = file_flash_read(area->nad_offset + off, &ndb, sizeof(ndb));
     assert(rc == 0);
-	assert(nffs_hash_id_is_block(ndb.ndb_id));
-	assert(!nffs_hash_id_is_inode(ndb.ndb_id));
+    assert(nffs_hash_id_is_block(ndb.ndb_id));
+    assert(!nffs_hash_id_is_inode(ndb.ndb_id));
 
     printf("   Block off %d id %x len %d seq %d prev %x ino %x\n",
            off, ndb.ndb_id, ndb.ndb_data_len, ndb.ndb_seq,
@@ -412,23 +412,23 @@ print_nffs_flash_V0block(struct nffs_area_desc *area, uint32_t off)
 static int
 print_nffs_flash_V0object(struct nffs_area_desc *area, uint32_t off)
 {
-	uint32_t magic;
+    uint32_t magic;
     int rc;
 
     rc = file_flash_read(area->nad_offset + off, &magic, sizeof magic);
     assert(rc == 0);
 
-	switch (magic) {
-	case NFFS_INODE_MAGIC:
+    switch (magic) {
+    case NFFS_INODE_MAGIC:
         return print_nffs_flash_V0inode(area, off);
 
-	case NFFS_BLOCK_MAGIC:
+    case NFFS_BLOCK_MAGIC:
         return print_nffs_flash_V0block(area, off);
 
-	case 0xffffffff:
+    case 0xffffffff:
         return area->nad_length;
 
-	default:
+    default:
         return 1;
     }
 }
@@ -591,7 +591,7 @@ main(int argc, char **argv)
     int cnt;
     struct stat st;
     int standalone = 0;
-
+            
     progname = argv[0];
 
     while ((ch = getopt(argc, argv, "c:d:f:sv")) != -1) {
@@ -636,6 +636,8 @@ main(int argc, char **argv)
     log_console_handler_init(&nffs_log_console_handler);
     log_register("nffs-log", &nffs_log, &nffs_log_console_handler);
 
+    file_scratch_idx = MAX_AREAS + 1;
+
     if (standalone) {
         fd = open(native_flash_file, O_RDWR);
         if ((rc = fstat(fd, &st)))