summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog5
-rw-r--r--common/get-passphrase.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index 1b09fd916..9468bfe3a 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-02 Marcus Brinkmann <marcus@g10code.de>
+
+ * get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
+ type to gpg_error_t.
+
2009-10-28 Werner Koch <wk@g10code.com>
* status.h (STATUS_MOUNTPOINT): New.
diff --git a/common/get-passphrase.c b/common/get-passphrase.c
index e1a11482e..090079405 100644
--- a/common/get-passphrase.c
+++ b/common/get-passphrase.c
@@ -103,7 +103,7 @@ start_agent (void)
/* This is the default inquiry callback. It merely handles the
Pinentry notification. */
-static int
+static gpg_error_t
default_inq_cb (void *opaque, const char *line)
{
(void)opaque;
@@ -120,7 +120,7 @@ default_inq_cb (void *opaque, const char *line)
}
-static int
+static gpg_error_t
membuf_data_cb (void *opaque, const void *buffer, size_t length)
{
membuf_t *data = opaque;