gnupg/g10 (ChangeLog keyedit.c keylist.c passphrase.c)

[cvs user wk]

    Date: Friday, December 17, 2004 @ 19:51:32
  Author: wk
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyedit.c keylist.c passphrase.c

* passphrase.c (agent_get_passphrase): Define NREAD locally as
size_t or int.

* keylist.c (list_keyblock_print): Make field width an int.
* keyedit.c (show_key_with_all_names): Ditto.


--------------+
 ChangeLog    |    8 ++++++++
 keyedit.c    |    2 +-
 keylist.c    |    2 +-
 passphrase.c |    4 +++-
 4 files changed, 13 insertions(+), 3 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.660 gnupg/g10/ChangeLog:1.661
--- gnupg/g10/ChangeLog:1.660	Thu Dec 16 06:16:08 2004
+++ gnupg/g10/ChangeLog	Fri Dec 17 19:51:32 2004
@@ -1,3 +1,11 @@
+2004-12-17  Werner Koch  <wk at g10code.com>
+
+	* passphrase.c (agent_get_passphrase): Define NREAD locally as
+	size_t or int.
+
+	* keylist.c (list_keyblock_print): Make field width an int.
+	* keyedit.c (show_key_with_all_names): Ditto.
+
 2004-12-16  David Shaw  <dshaw at jabberwocky.com>
 
 	* g10.c (main): Add --require-secmem/--no-require-secmem to cause
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.160 gnupg/g10/keyedit.c:1.161
--- gnupg/g10/keyedit.c:1.160	Tue Dec 14 15:50:15 2004
+++ gnupg/g10/keyedit.c	Fri Dec 17 19:51:32 2004
@@ -2344,7 +2344,7 @@
 	      {
 		if(opt.trust_model!=TM_ALWAYS)
 		  {
-		    tty_printf("%*s",keystrlen()+13,"");
+		    tty_printf("%*s", (int)keystrlen()+13,"");
 		    /* Ownertrust is only meaningful for the PGP or
 		       classic trust models */
 		    if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
Index: gnupg/g10/keylist.c
diff -u gnupg/g10/keylist.c:1.91 gnupg/g10/keylist.c:1.92
--- gnupg/g10/keylist.c:1.91	Wed Dec 15 06:16:53 2004
+++ gnupg/g10/keylist.c	Fri Dec 17 19:51:32 2004
@@ -787,7 +787,7 @@
 		printf("uid%*s%s ",indent,"",validity);
 	      }
 	    else
-	      printf("uid%*s",keystrlen()+10,"");
+	      printf("uid%*s", (int)keystrlen()+10,"");
 
             print_utf8_string( stdout, uid->name, uid->len );
 	    putchar('\n');
Index: gnupg/g10/passphrase.c
diff -u gnupg/g10/passphrase.c:1.72 gnupg/g10/passphrase.c:1.73
--- gnupg/g10/passphrase.c:1.72	Tue Dec 14 09:03:56 2004
+++ gnupg/g10/passphrase.c	Fri Dec 17 19:51:32 2004
@@ -643,7 +643,6 @@
   char *atext = NULL;
   char buf[50];
   int fd = -1;
-  int nread;
   u32 reply;
   char *pw = NULL;
   PKT_public_key *pk = m_alloc_clear( sizeof *pk );
@@ -742,6 +741,8 @@
                 
   if (!prot)
     { /* old style protocol */
+      size_t nread;
+
       n = 4 + 20 + strlen (atext);
       u32tobuf (buf, n );
       u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE );
@@ -814,6 +815,7 @@
     }
   else
     { /* The new Assuan protocol */
+      int nread;
       char *line, *p;
       const unsigned char *s;
       int i;