* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire): Remove

the need for ask_expiredate().

4 files changed, 9 insertions, 10 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 25db980aa..a0a956382 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  David Shaw  <[email protected]>
+
+	* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire):
+	Remove the need for ask_expiredate().
+
 2007-01-30  David Shaw  <[email protected]>
 
 	* keygen.c (make_backsig, write_direct_sig, write_selfsigs)
diff --git a/g10/keyedit.c b/g10/keyedit.c
index c1e0ec3ca..7fa6b6800 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3540,7 +3540,10 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
 	no_primary_warning(pub_keyblock);
       }
 
-    expiredate = ask_expiredate();
+    expiredate=ask_expire_interval(0,NULL);
+    if(expiredate)
+      expiredate+=make_timestamp();
+
     node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
     sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
 
diff --git a/g10/keygen.c b/g10/keygen.c
index 2f2eeb426..be506c5bc 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1699,14 +1699,6 @@ ask_expire_interval(int object,const char *def_expire)
     return interval;
 }
 
-u32
-ask_expiredate()
-{
-    u32 x = ask_expire_interval(0,NULL);
-    return x? make_timestamp() + x : 0;
-}
-
-
 static char *
 ask_user_id( int mode )
 {
diff --git a/g10/main.h b/g10/main.h
index 7abb2b357..86f59f355 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -172,7 +172,6 @@ void show_basic_key_info (KBNODE keyblock);
 /*-- keygen.c --*/
 u32 parse_expire_string(const char *string);
 u32 ask_expire_interval(int object,const char *def_expire);
-u32 ask_expiredate(void);
 void generate_keypair( const char *fname, const char *card_serialno,
                        const char *backup_encryption_dir );
 int keygen_set_std_prefs (const char *string,int personal);