From 60586e122f48c2282e84a34f6f6e78f4c1f55bc9 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 23 Aug 2012 11:29:47 +0800 Subject: [PATCH] sbkeysync: Rename struct keystore_entry->list to keystore_list We want to collect keystore entries on a separate list, so rename the 'list' member to something more specific. Signed-off-by: Jeremy Kerr --- src/sbkeysync.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sbkeysync.c b/src/sbkeysync.c index 57f66de..299df05 100644 --- a/src/sbkeysync.c +++ b/src/sbkeysync.c @@ -110,7 +110,7 @@ struct fs_keystore_entry { const char *name; uint8_t *data; size_t len; - struct list_node list; + struct list_node keystore_list; }; struct fs_keystore { @@ -390,7 +390,7 @@ static int read_keystore_key_database(struct key_database *kdb, add_ctx.keystore = keystore; add_ctx.kdb = kdb; - list_for_each(&keystore->keys, ke, list) { + list_for_each(&keystore->keys, ke, keystore_list) { unsigned int len; void *buf; @@ -538,7 +538,7 @@ static bool keystore_contains_file(struct fs_keystore *keystore, { struct fs_keystore_entry *ke; - list_for_each(&keystore->keys, ke, list) { + list_for_each(&keystore->keys, ke, keystore_list) { if (!strcmp(ke->name, filename)) return true; } @@ -584,7 +584,7 @@ static int update_keystore(struct fs_keystore *keystore, const char *root) if (keystore_entry_read(ke)) talloc_free(ke); else - list_add(&keystore->keys, &ke->list); + list_add(&keystore->keys, &ke->keystore_list); } closedir(dir); @@ -616,7 +616,7 @@ static void print_keystore(struct fs_keystore *keystore) printf("Filesystem keystore:\n"); - list_for_each(&keystore->keys, ke, list) + list_for_each(&keystore->keys, ke, keystore_list) printf(" %s/%s [%zd bytes]\n", ke->root, ke->name, ke->len); }