summaryrefslogtreecommitdiff
path: root/trust/token.c
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2013-06-28 17:19:22 +0200
committerStef Walter <stef@thewalter.net>2013-07-03 11:46:28 +0200
commit1c4522e5df79bd197feab8448008fc2bf6b4ea2e (patch)
treeb33284d2501cb32a6cf9fc0e9b0983220c174fb7 /trust/token.c
parent17bc43cb82320f2aba4ccb804bd8599232524c6a (diff)
downloadp11-kit-1c4522e5df79bd197feab8448008fc2bf6b4ea2e.tar.gz
trust: Rename p11_index_batch() to p11_index_load()
The name makes it clearer what's going on. This is only used during loading, so we can track whether a change has resulted from the trust module or from the file storage.
Diffstat (limited to 'trust/token.c')
-rw-r--r--trust/token.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/trust/token.c b/trust/token.c
index ec34f6c..cbb522e 100644
--- a/trust/token.c
+++ b/trust/token.c
@@ -208,7 +208,7 @@ loader_load_file (p11_token *token,
return_val_if_fail (parsed->elem[i] != NULL, 0);
}
- p11_index_batch (token->index);
+ p11_index_load (token->index);
/* Now place all of these in the index */
rv = p11_index_replace_all (token->index, origin, CKA_CLASS, parsed);
@@ -366,7 +366,7 @@ load_builtin_objects (p11_token *token)
{ CKA_INVALID },
};
- p11_index_batch (token->index);
+ p11_index_load (token->index);
rv = p11_index_take (token->index, p11_attrs_dup (builtin_root_list), NULL);
return_val_if_fail (rv == CKR_OK, 0);
p11_index_finish (token->index);