Changes in uspace/app/hbench/env.c [0db0df2:68655bc2] in mainline

File:

• uspace/app/hbench/env.c (modified) (6 diffs)

uspace/app/hbench/env.c

@@ -34 +34 @@
  */
 
-#include <adt/hash.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -43 +42 @@
         ht_link_t link;
 
-        size_t hash;
         char *key;
         char *value;
@@ -51 +49 @@
 {
         param_t *param = hash_table_get_inst(item, param_t, link);
-        return param->hash;
+        return str_size(param->key);
 }
 
 static size_t param_key_hash(const void *key)
 {
-        return hash_string(key);
+        const char *key_str = key;
+        return str_size(key_str);
 }
 
-static bool param_key_equal(const void *key, size_t hash, const ht_link_t *item)
+static bool param_key_equal(const void *key, const ht_link_t *item)
 {
         param_t *param = hash_table_get_inst(item, param_t, link);
+        const char *key_str = key;
 
-        if (param->hash != hash)
-                return false;
-
-        const char *key_str = key;
         return str_cmp(param->key, key_str) == 0;
 }
@@ -75 +71 @@
         param_t *b = hash_table_get_inst(link_b, param_t, link);
 
-        return a->hash == b->hash && str_cmp(a->key, b->key) == 0;
+        return str_cmp(a->key, b->key) == 0;
 }
 
@@ -120 +116 @@
         param->key = str_dup(key);
         param->value = str_dup(value);
-        param->hash = hash_string(key);
 
         if ((param->key == NULL) || (param->value == NULL)) {
@@ -137 +132 @@
 const char *bench_env_param_get(bench_env_t *env, const char *key, const char *default_value)
 {
-        ht_link_t *item = hash_table_find(&env->parameters, key);
+        ht_link_t *item = hash_table_find(&env->parameters, (char *) key);
 
         if (item == NULL) {