[Pkg-gnupg-commit] [gpgme] 343/412: tests: Use gpgme_io_write in passhrase callbacks.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 4491ef0a9a15d3b307d1ade37ff620ef9fcb2478
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Sep 13 20:46:41 2016 +0200

    tests: Use gpgme_io_write in passhrase callbacks.
    
    * tests/gpg/t-support.h (passphrase_cb): Use gpgme_io_write.
    * tests/gpgsm/t-support.h (passphrase_cb): Ditto.
    * tests/run-support.h (passphrase_cb): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 tests/gpg/t-support.h   | 16 +++++++---------
 tests/gpgsm/t-support.h |  9 +++++++--
 tests/run-support.h     | 16 +++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h
index 6a18b5c..7a0b9f9 100644
--- a/tests/gpg/t-support.h
+++ b/tests/gpg/t-support.h
@@ -76,27 +76,25 @@ gpgme_error_t
 passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
 	       int last_was_bad, int fd)
 {
-#ifdef HAVE_W32_SYSTEM
-  DWORD written;
-  WriteFile ((HANDLE) fd, "abc\n", 4, &written, 0);
-#else
   int res;
-  char *pass = "abc\n";
+  char pass[] = "abc\n";
   int passlen = strlen (pass);
   int off = 0;
 
+  (void)opaque;
+  (void)uid_hint;
+  (void)passphrase_info;
+  (void)last_was_bad;
+
   do
     {
-      res = write (fd, &pass[off], passlen - off);
+      res = gpgme_io_write (fd, &pass[off], passlen - off);
       if (res > 0)
 	off += res;
     }
   while (res > 0 && off != passlen);
 
   return off == passlen ? 0 : gpgme_error_from_errno (errno);
-#endif
-
-  return 0;
 }
 
 
diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h
index cc1a7db..ae3ad1f 100644
--- a/tests/gpgsm/t-support.h
+++ b/tests/gpgsm/t-support.h
@@ -63,13 +63,18 @@ passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
 	       int last_was_bad, int fd)
 {
   int res;
-  char *pass = "abc\n";
+  char pass[] = "abc\n";
   int passlen = strlen (pass);
   int off = 0;
 
+  (void)opaque;
+  (void)uid_hint;
+  (void)passphrase_info;
+  (void)last_was_bad;
+
   do
     {
-      res = write (fd, &pass[off], passlen - off);
+      res = gpgme_io_write (fd, &pass[off], passlen - off);
       if (res > 0)
 	off += res;
     }
diff --git a/tests/run-support.h b/tests/run-support.h
index b1aea4b..e4a4f70 100644
--- a/tests/run-support.h
+++ b/tests/run-support.h
@@ -75,27 +75,25 @@ gpgme_error_t
 passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
 	       int last_was_bad, int fd)
 {
-#ifdef HAVE_W32_SYSTEM
-  DWORD written;
-  WriteFile ((HANDLE) fd, "abc\n", 4, &written, 0);
-#else
   int res;
-  char *pass = "abc\n";
+  char pass[] = "abc\n";
   int passlen = strlen (pass);
   int off = 0;
 
+  (void)opaque;
+  (void)uid_hint;
+  (void)passphrase_info;
+  (void)last_was_bad;
+
   do
     {
-      res = write (fd, &pass[off], passlen - off);
+      res = gpgme_io_write (fd, &pass[off], passlen - off);
       if (res > 0)
 	off += res;
     }
   while (res > 0 && off != passlen);
 
   return off == passlen ? 0 : gpgme_error_from_errno (errno);
-#endif
-
-  return 0;
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git