* Code cleanup:

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

2 files changed, 25 insertions, 32 deletions

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index a5d9583596c..3fd4e52b33f 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -802,7 +802,7 @@ dump_fragments(struct b_lists *pL)
 		putLabeledWord("\tbuild_list: compr = ", jNode->compr);
 		putLabeledWord("\tbuild_list: usercompr = ", jNode->usercompr);
 		putLabeledWord("\tbuild_list: flags = ", jNode->flags);
-		putLabeledWord("\tbuild_list: offset = ", b->offset);	// FIXME: ? [RS]
+		putLabeledWord("\tbuild_list: offset = ", b->offset);	/* FIXME: ? [RS] */
 		b = b->next;
 	}
 }
@@ -832,7 +832,7 @@ dump_dirents(struct b_lists *pL)
 		putLabeledWord("\tbuild_list: type = ", jDir->type);
 		putLabeledWord("\tbuild_list: node_crc = ", jDir->node_crc);
 		putLabeledWord("\tbuild_list: name_crc = ", jDir->name_crc);
-		putLabeledWord("\tbuild_list: offset = ", b->offset); 	// FIXME: ? [RS]
+		putLabeledWord("\tbuild_list: offset = ", b->offset); 	/* FIXME: ? [RS] */
 		b = b->next;
 	}
 }
@@ -935,9 +935,6 @@ jffs2_1pass_build_lists(struct part_info * part)
 }
 
 
-
-
-
 static u32
 jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL)
 {
@@ -965,7 +962,6 @@ jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL)
 }
 
 
-
 static struct b_lists *
 jffs2_get_list(struct part_info * part, const char *who)
 {
@@ -1005,9 +1001,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname)
 }
 
 
-
-
-
 /* Load a file from flash into memory. fname can be a full path */
 u32
 jffs2_1pass_load(char *dest, struct part_info * part, const char *fname)
diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h
index c6d5fe36032..d53e5764b8e 100644
--- a/fs/jffs2/jffs2_private.h
+++ b/fs/jffs2/jffs2_private.h
@@ -42,48 +42,48 @@ static inline int
 hdr_crc(struct jffs2_unknown_node *node)
 {
 #if 1
-        u32 crc = crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_unknown_node) - 4);
+	u32 crc = crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_unknown_node) - 4);
 #else
 	/* what's the semantics of this? why is this here? */
-        u32 crc = crc32_no_comp(~0, (unsigned char *)node, sizeof(struct jffs2_unknown_node) - 4);
+	u32 crc = crc32_no_comp(~0, (unsigned char *)node, sizeof(struct jffs2_unknown_node) - 4);
 
-        crc ^= ~0;
+	crc ^= ~0;
 #endif
-        if (node->hdr_crc != crc) {
-                return 0;
-        } else {
-                return 1;
-        }
+	if (node->hdr_crc != crc) {
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 static inline int
 dirent_crc(struct jffs2_raw_dirent *node)
 {
-        if (node->node_crc != crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_raw_dirent) - 8)) {
-                return 0;
-        } else {
-                return 1;
-        }
+	if (node->node_crc != crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_raw_dirent) - 8)) {
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 static inline int
 dirent_name_crc(struct jffs2_raw_dirent *node)
 {
-        if (node->name_crc != crc32_no_comp(0, (unsigned char *)&(node->name), node->nsize)) {
-                return 0;
-        } else {
-                return 1;
-        }
+	if (node->name_crc != crc32_no_comp(0, (unsigned char *)&(node->name), node->nsize)) {
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 static inline int
 inode_crc(struct jffs2_raw_inode *node)
 {
-        if (node->node_crc != crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_raw_inode) - 8)) {
-                return 0;
-        } else {
-                return 1;
-        }
+	if (node->node_crc != crc32_no_comp(0, (unsigned char *)node, sizeof(struct jffs2_raw_inode) - 8)) {
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 #endif /* jffs2_private.h */