Add more comment for yaffs_PruneWorker function.

diff --git a/yaffs_guts.c b/yaffs_guts.c
index d6e4b11a90acff73824a5a2c94c42707b2884b01..d3539a019d52a8cea9f2fc073665a55cb395f6c7 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
  */
 
 const char *yaffs_guts_c_version =

-    "$Id: yaffs_guts.c,v 1.101 2009-12-25 01:53:05 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.102 2009-12-30 22:30:12 charles Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 


@@ -1807,6 +1807,10 @@ static void yaffs_SoftDeleteFile(yaffs_Object *obj)
  * level 0 tnode entries must be zeroed out.
  * Could also use this for file deletion, but that's probably better handled
  * by a special case.
  * level 0 tnode entries must be zeroed out.
  * Could also use this for file deletion, but that's probably better handled
  * by a special case.

+ *
+ * This function is recursive. For levels > 0 the function is called again on
+ * any sub-tree. For level == 0 we just check if the sub-tree has data.
+ * If there is no data in a subtree then it is pruned.

  */
 
 static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
  */
 
 static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,


@@ -1819,25 +1823,25 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
                hasData = 0;
 
                if(level > 0){
                hasData = 0;
 
                if(level > 0){

-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-                               if (tn->internal[i]) {
-                                       tn->internal[i] =
-                                               yaffs_PruneWorker(dev, tn->internal[i],
-                                                       level - 1,
-                                                       (i == 0) ? del0 : 1);
-                               }
-
-                               if (tn->internal[i])
-                                       hasData++;
-                        }
+                       for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
+                               if (tn->internal[i]) {
+                                       tn->internal[i] =
+                                               yaffs_PruneWorker(dev, tn->internal[i],
+                                                       level - 1,
+                                                       (i == 0) ? del0 : 1);
+                               }
+
+                               if (tn->internal[i])
+                                       hasData++;
+                       }

                } else {
                } else {

-                       int tnodeSize;
-                       __u32 *map = (__u32 *)tn;
-                       tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+                       int tnodeSize;
+                       __u32 *map = (__u32 *)tn;
+                       tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;

 
 

-                       if (tnodeSize < sizeof(yaffs_Tnode))
-                               tnodeSize = sizeof(yaffs_Tnode);
-                        tnodeSize /= sizeof(__u32);
+                       if (tnodeSize < sizeof(yaffs_Tnode))
+                               tnodeSize = sizeof(yaffs_Tnode);
+                       tnodeSize /= sizeof(__u32);

 
                         for(i = 0; !hasData && i < tnodeSize; i++){
                                 if(map[i])
 
                         for(i = 0; !hasData && i < tnodeSize; i++){
                                 if(map[i])