Changeset ab77928 in mainline for uspace/lib/ext4/libext4_hash.c

Timestamp:

2011-10-26T09:27:01Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

0dc91833

Parents:

aaedaba

Message:

complete directory index reading (it runs) - many TODOs remaining

File:

• uspace/lib/ext4/libext4_hash.c (modified) (7 diffs)

uspace/lib/ext4/libext4_hash.c

@@ -49 +49 @@
 #define H(x, y, z) ((x) ^ (y) ^ (z))
 
+
 /*
  * The generic round function.  The application is so specific that
@@ -62 +63 @@
 
 
-static void tea_transform(uint32_t buf[4],uint32_t const in[])
+static void tea_transform(uint32_t buf[4], uint32_t const in[])
 {
         uint32_t sum = 0;
@@ -233 +234 @@
     int i;
     uint32_t in[8], buf[4];
-    bool unsigned_version = false;
+    void (*str2hashbuf)(const char *, int, uint32_t *, int) = str2hashbuf_signed;
+
+    /*
+    for (i = 0; i < 8; ++i) {
+        in[i] = 0;
+    }
+    */
 
     /* Initialize the default seed for the hash checksum functions */
@@ -247 +254 @@
                 break;
                         }
-                        if (i < 4) {
-                                memcpy(buf, hinfo->seed, sizeof(buf));
-                        }
+                }
+                if (i < 4) {
+                        memcpy(buf, hinfo->seed, sizeof(buf));
                 }
     }
@@ -264 +271 @@
 
                 case EXT4_HASH_VERSION_HALF_MD4_UNSIGNED:
-                        unsigned_version = true;
+                        str2hashbuf = str2hashbuf_unsigned;
 
                 case EXT4_HASH_VERSION_HALF_MD4:
                         p = name;
                         while (len > 0) {
-                                if (unsigned_version) {
-                                        str2hashbuf_unsigned(p, len, in, 8);
-                                } else {
-                                        str2hashbuf_signed(p, len, in, 8);
-                                }
+                                (*str2hashbuf)(p, len, in, 8);
                                 half_md4_transform(buf, in);
                                 len -= 32;
@@ -284 +287 @@
 
                 case EXT4_HASH_VERSION_TEA_UNSIGNED:
-                        unsigned_version = true;
+                        str2hashbuf = str2hashbuf_unsigned;
 
                 case EXT4_HASH_VERSION_TEA:
                         p = name;
                         while (len > 0) {
-                                if (unsigned_version) {
-                                        str2hashbuf_unsigned(p, len, in, 4);
-                                } else {
-                                        str2hashbuf_signed(p, len, in, 4);
-                                }
+                                (*str2hashbuf)(p, len, in, 4);
                                 tea_transform(buf, in);
                                 len -= 16;
@@ -311 +310 @@
                 hash = (EXT4_DIRECTORY_HTREE_EOF-1) << 1;
         }
+
         hinfo->hash = hash;
         hinfo->minor_hash = minor_hash;