const struct osl_object *obj)
{
HASH_TYPE hash[HASH_SIZE];
- hash_object(obj, hash);
+ hash_object(t, obj, hash);
return disk_storage_name_of_hash(t, hash);
}
return -E_OSL_NOMEM;
}
-static void column_name_hash(const char *col_name, HASH_TYPE *hash)
+static void column_name_hash(const struct osl_table *t, const char *col_name,
+ HASH_TYPE *hash)
{
- hash_function(col_name, strlen(col_name), hash);
+ hash_function(t->version, col_name, strlen(col_name), hash);
}
static int init_column_descriptions(struct osl_table *t)
if (ret < 0)
goto out;
}
- column_name_hash(cd->name, t->columns[i].name_hash);
+ column_name_hash(t, cd->name, t->columns[i].name_hash);
ret = -E_OSL_NOMEM;
filename = column_filename(t, i);
if (!filename)
FOR_EACH_COLUMN(i, t->desc, cd) {
if (cd->storage_type == OSL_NO_STORAGE)
continue;
- column_name_hash(cd->name, t->columns[i].name_hash);
+ column_name_hash(t, cd->name, t->columns[i].name_hash);
if (num_rows > 0 && cd->storage_type == OSL_MAPPED_STORAGE) {
ret = map_column(t, i);
if (ret < 0)