gnupg/g10 (ChangeLog passphrase.c)

[cvs user dshaw]

    Date: Monday, January 10, 2005 @ 23:56:47
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog passphrase.c

* passphrase.c (readline, agent_send_option, agent_open,
agent_get_passphrase, passphrase_clear_cache): Rename readline() to
readaline() to keep readline library namespace clear.


--------------+
 ChangeLog    |    6 ++++++
 passphrase.c |   12 +++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.678 gnupg/g10/ChangeLog:1.679
--- gnupg/g10/ChangeLog:1.678	Thu Jan  6 17:23:47 2005
+++ gnupg/g10/ChangeLog	Mon Jan 10 23:56:46 2005
@@ -1,3 +1,9 @@
+2005-01-10  David Shaw  <dshaw at jabberwocky.com>
+
+	* passphrase.c (readline, agent_send_option, agent_open,
+	agent_get_passphrase, passphrase_clear_cache): Rename readline()
+	to readaline() to keep readline library namespace clear.
+
 2005-01-06  David Shaw  <dshaw at jabberwocky.com>
 
 	* filter.h, armor.c (armor_filter): Use the eol string from the
Index: gnupg/g10/passphrase.c
diff -u gnupg/g10/passphrase.c:1.74 gnupg/g10/passphrase.c:1.75
--- gnupg/g10/passphrase.c:1.74	Mon Dec 20 06:19:09 2004
+++ gnupg/g10/passphrase.c	Mon Jan 10 23:56:46 2005
@@ -299,7 +299,7 @@
 
 /* read an entire line */
 static int
-readline (int fd, char *buf, size_t buflen)
+readaline (int fd, char *buf, size_t buflen)
 {
   size_t nleft = buflen;
   char *p;
@@ -360,7 +360,7 @@
     return -1;
   
   /* get response */
-  nread = readline (fd, buf, DIM(buf)-1);
+  nread = readaline (fd, buf, DIM(buf)-1);
   if (nread < 3)
     return -1;
   
@@ -584,7 +584,7 @@
       char line[200];
       int nread;
 
-      nread = readline (fd, line, DIM(line));
+      nread = readaline (fd, line, DIM(line));
       if (nread < 3 || !(line[0] == 'O' && line[1] == 'K'
                          && (line[2] == '\n' || line[2] == ' ')) ) {
         log_error ( _("communication problem with gpg-agent\n"));
@@ -900,7 +900,7 @@
       
       /* get response */
       pw = m_alloc_secure (500);
-      nread = readline (fd, pw, 499);
+      nread = readaline (fd, pw, 499);
       if (nread < 3)
         goto failure;
       
@@ -1035,7 +1035,7 @@
         goto failure;
       
       /* get response */
-      nread = readline (fd, buf, DIM(buf)-1);
+      nread = readaline (fd, buf, DIM(buf)-1);
       if (nread < 3)
         goto failure;
       
@@ -1056,8 +1056,6 @@
 }
 
 
-
-
 /****************
  * Ask for a passphrase and return that string.
  */