Changeset af8ce880 in mainline

Timestamp:

2011-04-05T17:11:50Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2bbbfd3

Parents:

8829e33

Message:

Change wrong name to the di_block variable (new name is ind2_block)

File:

• uspace/srv/fs/minixfs/mfs_rw.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs_rw.c

@@ -191 +191 @@
          *zone pointer in the chain.
          */
-        uint32_t di_block = rblock / ptrs_per_block;
+        uint32_t ind2_block = rblock / ptrs_per_block;
 
         /*read the second indirect zone of the chain*/
         if (fs_version == MFS_VERSION_V1) {
                 uint16_t *pt16 = bi1->data;
-                uint16_t blk = conv16(sbi->native, pt16[di_block]);
+                uint16_t blk = conv16(sbi->native, pt16[ind2_block]);
 
                 if (blk == 0) {
@@ -206 +206 @@
 
                                 blk = block;
-                                pt16[di_block] = conv16(sbi->native, blk);
+                                pt16[ind2_block] = conv16(sbi->native, blk);
                                 bi1->dirty = true;
                         } else {
@@ -220 +220 @@
 
                 pt16 = bi2->data;
-                pt16 += di_block % ptrs_per_block;
+                pt16 += ind2_block % ptrs_per_block;
                 *b = conv16(sbi->native, *pt16);
                 if (write_mode) {
@@ -228 +228 @@
         } else {
                 uint32_t *pt32 = bi1->data;
-                uint32_t blk = conv32(sbi->native, pt32[di_block]);
+                uint32_t blk = conv32(sbi->native, pt32[ind2_block]);
 
                 if (blk == 0) {
@@ -238 +238 @@
 
                                 blk = block;
-                                pt32[di_block] = conv32(sbi->native, blk);
+                                pt32[ind2_block] = conv32(sbi->native, blk);
                                 bi1->dirty = true;
                         } else {
@@ -252 +252 @@
 
                 pt32 = bi2->data;
-                pt32 += di_block % ptrs_per_block;
+                pt32 += ind2_block % ptrs_per_block;
                 *b = conv32(sbi->native, *pt32);
                 if (write_mode) {