[svn] GnuPG - r4417 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-01-31 20:42:48 +0100 (Wed, 31 Jan 2007)
New Revision: 4417

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyedit.c
   branches/STABLE-BRANCH-1-4/g10/keygen.c
   branches/STABLE-BRANCH-1-4/g10/main.h
Log:
* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire): Remove
the need for ask_expiredate().


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-01-31 15:22:21 UTC (rev 4416)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-01-31 19:42:48 UTC (rev 4417)
@@ -1,3 +1,8 @@
+2007-01-31  David Shaw  <dshaw at jabberwocky.com>
+
+	* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire):
+	Remove the need for ask_expiredate().
+
 2007-01-30  David Shaw  <dshaw at jabberwocky.com>
 
 	* keygen.c (make_backsig, write_direct_sig, write_selfsigs)

Modified: branches/STABLE-BRANCH-1-4/g10/keyedit.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyedit.c	2007-01-31 15:22:21 UTC (rev 4416)
+++ branches/STABLE-BRANCH-1-4/g10/keyedit.c	2007-01-31 19:42:48 UTC (rev 4417)
@@ -3540,7 +3540,10 @@
 	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);
 

Modified: branches/STABLE-BRANCH-1-4/g10/keygen.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keygen.c	2007-01-31 15:22:21 UTC (rev 4416)
+++ branches/STABLE-BRANCH-1-4/g10/keygen.c	2007-01-31 19:42:48 UTC (rev 4417)
@@ -1699,14 +1699,6 @@
     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 )
 {

Modified: branches/STABLE-BRANCH-1-4/g10/main.h
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/main.h	2007-01-31 15:22:21 UTC (rev 4416)
+++ branches/STABLE-BRANCH-1-4/g10/main.h	2007-01-31 19:42:48 UTC (rev 4417)
@@ -172,7 +172,6 @@
 /*-- 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);