svn_rev_003

remove all #if 0 and #if 1

5 files changed, 0 insertions, 133 deletions

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 41ff4c1fbb..e156cd3811 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -399,10 +399,6 @@ add_node(struct b_list *list)
 	memBase = list->listMemBase;
 	if (memBase != NULL)
 		index = memBase->index;
-#if 0
-	putLabeledWord("add_node: index = ", index);
-	putLabeledWord("add_node: memBase = ", list->listMemBase);
-#endif
 
 	if (memBase == NULL || index >= NODE_CHUNK) {
 		/* we need more space before we continue */
@@ -413,9 +409,6 @@ add_node(struct b_list *list)
 		}
 		memBase->next = list->listMemBase;
 		index = 0;
-#if 0
-		putLabeledWord("add_node: alloced a new membase at ", *memBase);
-#endif
 
 	}
 	/* now we have room to add it. */
@@ -628,18 +621,6 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
 	for (b = pL->frag.listHead; b != NULL; b = b->next) {
 		jNode = (struct jffs2_raw_inode *) get_node_mem(b->offset);
 		if ((inode == jNode->ino)) {
-#if 0
-			putLabeledWord("\r\n\r\nread_inode: totlen = ", jNode->totlen);
-			putLabeledWord("read_inode: inode = ", jNode->ino);
-			putLabeledWord("read_inode: version = ", jNode->version);
-			putLabeledWord("read_inode: isize = ", jNode->isize);
-			putLabeledWord("read_inode: offset = ", jNode->offset);
-			putLabeledWord("read_inode: csize = ", jNode->csize);
-			putLabeledWord("read_inode: dsize = ", jNode->dsize);
-			putLabeledWord("read_inode: compr = ", jNode->compr);
-			putLabeledWord("read_inode: usercompr = ", jNode->usercompr);
-			putLabeledWord("read_inode: flags = ", jNode->flags);
-#endif
 
 #ifndef CFG_JFFS2_SORT_FRAGMENTS
 			/* get actual file length from the newest node */
@@ -658,10 +639,6 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
 				}
 
 				lDest = (uchar *) (dest + jNode->offset);
-#if 0
-				putLabeledWord("read_inode: src = ", src);
-				putLabeledWord("read_inode: dest = ", lDest);
-#endif
 				switch (jNode->compr) {
 				case JFFS2_COMPR_NONE:
 					ret = (unsigned long) ldr_memcpy(lDest, src, jNode->dsize);
@@ -700,18 +677,11 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
 				}
 			}
 
-#if 0
-			putLabeledWord("read_inode: totalSize = ", totalSize);
-			putLabeledWord("read_inode: compr ret = ", ret);
-#endif
 		}
 		counter++;
 		put_fl_mem(jNode);
 	}
 
-#if 0
-	putLabeledWord("read_inode: returning = ", totalSize);
-#endif
 	return totalSize;
 }
 
@@ -750,15 +720,6 @@ jffs2_1pass_find_inode(struct b_lists * pL, const char *name, u32 pino)
 			inode = jDir->ino;
 			version = jDir->version;
 		}
-#if 0
-		putstr("\r\nfind_inode:p&l ->");
-		putnstr(jDir->name, jDir->nsize);
-		putstr("\r\n");
-		putLabeledWord("pino = ", jDir->pino);
-		putLabeledWord("nsize = ", jDir->nsize);
-		putLabeledWord("b = ", (u32) b);
-		putLabeledWord("counter = ", counter);
-#endif
 		put_fl_mem(jDir);
 	}
 	return inode;
@@ -903,25 +864,9 @@ jffs2_1pass_search_inode(struct b_lists * pL, const char *fname, u32 pino)
 	{
 		strncpy(working_tmp, tmp, c - tmp);
 		working_tmp[c - tmp] = '\0';
-#if 0
-		putstr("search_inode: tmp = ");
-		putstr(tmp);
-		putstr("\r\n");
-		putstr("search_inode: wtmp = ");
-		putstr(working_tmp);
-		putstr("\r\n");
-		putstr("search_inode: c = ");
-		putstr(c);
-		putstr("\r\n");
-#endif
 		for (i = 0; i < strlen(c) - 1; i++)
 			tmp[i] = c[i + 1];
 		tmp[i] = '\0';
-#if 0
-		putstr("search_inode: post tmp = ");
-		putstr(tmp);
-		putstr("\r\n");
-#endif
 
 		if (!(pino = jffs2_1pass_find_inode(pL, working_tmp, pino))) {
 			putstr("find_inode failed for name=");
@@ -991,12 +936,6 @@ jffs2_1pass_resolve_inode(struct b_lists * pL, u32 ino)
 		if (jNode->ino == jDirFoundIno) {
 			src = (unsigned char *)jNode + sizeof(struct jffs2_raw_inode);
 
-#if 0
-			putLabeledWord("\t\t dsize = ", jNode->dsize);
-			putstr("\t\t target = ");
-			putnstr(src, jNode->dsize);
-			putstr("\r\n");
-#endif
 			strncpy(tmp, (char *)src, jNode->dsize);
 			tmp[jNode->dsize] = '\0';
 			put_fl_mem(jNode);
@@ -1243,13 +1182,6 @@ jffs2_1pass_build_lists(struct part_info * part)
 	/* turn the lcd back on. */
 	/* splash(); */
 
-#if 0
-	putLabeledWord("dir entries = ", pL->dir.listCount);
-	putLabeledWord("frag entries = ", pL->frag.listCount);
-	putLabeledWord("+4 increments = ", counter4);
-	putLabeledWord("+file_offset increments = ", counterF);
-
-#endif
 
 #ifdef DEBUG_DIRENTS
 	dump_dirents(pL);
@@ -1327,10 +1259,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname)
 	}
 
 
-#if 0
-	putLabeledWord("found file at inode = ", inode);
-	putLabeledWord("read_inode returns = ", ret);
-#endif
 
 	return ret;
 }
diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c
index e78af7578b..6552ed5939 100644
--- a/fs/jffs2/jffs2_nand_1pass.c
+++ b/fs/jffs2/jffs2_nand_1pass.c
@@ -520,25 +520,9 @@ jffs2_1pass_search_inode(struct b_lists * pL, const char *fname, u32 pino)
 	{
 		strncpy(working_tmp, tmp, c - tmp);
 		working_tmp[c - tmp] = '\0';
-#if 0
-		putstr("search_inode: tmp = ");
-		putstr(tmp);
-		putstr("\r\n");
-		putstr("search_inode: wtmp = ");
-		putstr(working_tmp);
-		putstr("\r\n");
-		putstr("search_inode: c = ");
-		putstr(c);
-		putstr("\r\n");
-#endif
 		for (i = 0; i < strlen(c) - 1; i++)
 			tmp[i] = c[i + 1];
 		tmp[i] = '\0';
-#if 0
-		putstr("search_inode: post tmp = ");
-		putstr(tmp);
-		putstr("\r\n");
-#endif
 
 		if (!(pino = jffs2_1pass_find_inode(pL, working_tmp, pino))) {
 			putstr("find_inode failed for name=");
@@ -686,20 +670,6 @@ jffs2_1pass_rescan_needed(struct part_info *part)
 	}
 
 	/* FIXME */
-#if 0
-	/* but suppose someone reflashed a partition at the same offset... */
-	b = pL->dir.listHead;
-	while (b) {
-		node = (struct jffs2_unknown_node *) get_fl_mem(b->offset,
-			sizeof(onode), &onode);
-		if (node->nodetype != JFFS2_NODETYPE_DIRENT) {
-			DEBUGF ("rescan: fs changed beneath me? (%lx)\n",
-					(unsigned long) b->offset);
-			return 1;
-		}
-		b = b->next;
-	}
-#endif
 	return 0;
 }
 
@@ -884,12 +854,6 @@ jffs2_1pass_build_lists(struct part_info * part)
 
 	putstr("\b\b done.\r\n");		/* close off the dots */
 
-#if 0
-	putLabeledWord("dir entries = ", pL->dir.listCount);
-	putLabeledWord("frag entries = ", pL->frag.listCount);
-	putLabeledWord("+4 increments = ", counter4);
-	putLabeledWord("+file_offset increments = ", counterF);
-#endif
 
 #ifdef DEBUG_DIRENTS
 	dump_dirents(pL);
@@ -966,10 +930,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname)
 		return 0;
 	}
 
-#if 0
-	putLabeledWord("found file at inode = ", inode);
-	putLabeledWord("read_inode returns = ", ret);
-#endif
 
 	return ret;
 }
diff --git a/fs/jffs2/jffs2_nand_private.h b/fs/jffs2/jffs2_nand_private.h
index 18cca8d076..b2cfa16ec0 100644
--- a/fs/jffs2/jffs2_nand_private.h
+++ b/fs/jffs2/jffs2_nand_private.h
@@ -53,14 +53,7 @@ struct b_jffs2_info {
 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);
-#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);
-
-	crc ^= ~0;
-#endif
 	if (node->hdr_crc != crc) {
 		return 0;
 	} else {
diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h
index 46ed644e4d..4527544727 100644
--- a/fs/jffs2/jffs2_private.h
+++ b/fs/jffs2/jffs2_private.h
@@ -40,14 +40,7 @@ struct b_jffs2_info {
 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);
-#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);
-
-	crc ^= ~0;
-#endif
 	if (node->hdr_crc != crc) {
 		return 0;
 	} else {
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index 4f511ec1a4..7940f09317 100644
--- a/fs/jffs2/mini_inflate.c
+++ b/fs/jffs2/mini_inflate.c
@@ -383,13 +383,6 @@ long decompress_block(unsigned char *dest, unsigned char *source,
 		else stream.error = COMP_UNKNOWN;
 	} while (!bfinal && !stream.error);
 
-#if 0
-	putstr("decompress_block start\r\n");
-	putLabeledWord("stream.error = ",stream.error);
-	putLabeledWord("stream.decoded = ",stream.decoded);
-	putLabeledWord("dest = ",dest);
-	putstr("decompress_block end\r\n");
-#endif
 	return stream.error ? -stream.error : stream.decoded;
 }