From 7345f3c2417957cdfebe919fa7bdb8e50fd57590 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 28 Sep 2017 15:10:20 +0900
Subject: [PATCH] Rename flash functions.

---
 ChangeLog     | 4 ++++
 src/flash.c   | 4 ++--
 src/gnuk.h    | 4 ++--
 src/openpgp.c | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7913082..93a8b80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-09-28  NIIBE Yutaka  <gniibe@fsij.org>
 
+	* src/flash.c (flash_do_storage_init): Rename from flash_init.
+	(flash_key_storage_init): Rename from flash_init_keys.
+	* src/openpgp.c (gpg_init): Use new function names.
+
 	* src/stdlib.h: Update for GNU/Linux emulation.
 
 	* src/Makefile: Support GNU/Linux emulation.
diff --git a/src/flash.c b/src/flash.c
index 0f25b36..e7d1110 100644
--- a/src/flash.c
+++ b/src/flash.c
@@ -103,7 +103,7 @@ static int key_available_at (const uint8_t *k, int key_size)
 
 #define CHIP_ID_REG      ((uint32_t *)0xe0042000)
 void
-flash_init (const uint8_t **p_do_start, const uint8_t **p_do_end)
+flash_do_storage_init (const uint8_t **p_do_start, const uint8_t **p_do_end)
 {
   uint16_t gen0, gen1;
   uint16_t *gen0_p = (uint16_t *)&_data_pool;
@@ -169,7 +169,7 @@ flash_activate (void)
 
 
 void
-flash_init_keys (void)
+flash_key_storage_init (void)
 {
   const uint8_t *p;
   int i;
diff --git a/src/gnuk.h b/src/gnuk.h
index 15aba51..db39b79 100644
--- a/src/gnuk.h
+++ b/src/gnuk.h
@@ -139,10 +139,10 @@ enum size_of_key {
 int gpg_get_algo_attr (enum kind_of_key kk);
 int gpg_get_algo_attr_key_size (enum kind_of_key kk, enum size_of_key s);
 
-void flash_init (const uint8_t **, const uint8_t **);
+void flash_do_storage_init (const uint8_t **, const uint8_t **);
 void flash_terminate (void);
 void flash_activate (void);
-void flash_init_keys (void);
+void flash_key_storage_init (void);
 void flash_do_release (const uint8_t *);
 const uint8_t *flash_do_write (uint8_t nr, const uint8_t *data, int len);
 uint8_t *flash_key_alloc (enum kind_of_key);
diff --git a/src/openpgp.c b/src/openpgp.c
index 1fdd01a..3e8b5b5 100644
--- a/src/openpgp.c
+++ b/src/openpgp.c
@@ -108,7 +108,7 @@ gpg_init (void)
   const uint8_t *flash_do_start;
   const uint8_t *flash_do_end;
 
-  flash_init (&flash_do_start, &flash_do_end);
+  flash_do_storage_init (&flash_do_start, &flash_do_end);
 
   if (flash_do_start == NULL)
     file_selection = FILE_CARD_TERMINATED;
@@ -116,7 +116,7 @@ gpg_init (void)
     file_selection = FILE_NONE;
 
   gpg_data_scan (flash_do_start, flash_do_end);
-  flash_init_keys ();
+  flash_key_storage_init ();
 }
 
 static void