diff options
| author | Werner Koch <[email protected]> | 2016-01-08 05:33:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-01-08 05:33:27 +0000 |
| commit | 833ba5faa1340aff80a205acbb701d4ae1d594d0 (patch) | |
| tree | aca806cf5e2c3a262f3d295f313243c7f1c10f0d /common/get-passphrase.c | |
| parent | gpg: Return an error code from keygrip_from_pk. (diff) | |
| download | gnupg-833ba5faa1340aff80a205acbb701d4ae1d594d0.tar.gz gnupg-833ba5faa1340aff80a205acbb701d4ae1d594d0.zip | |
common: New put_membuf_cb to replace static membuf_data_cb.
* common/membuf.c (put_membuf_cb): New.
* agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
put_membuf_cb.
* common/get-passphrase.c (membuf_data_cb): Ditto.
* g10/call-agent.c (membuf_data_cb): Ditto.
* sm/call-agent.c (membuf_data_cb): Ditto.
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/get-passphrase.c')
| -rw-r--r-- | common/get-passphrase.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/common/get-passphrase.c b/common/get-passphrase.c index 53ce7d136..f1517fbfa 100644 --- a/common/get-passphrase.c +++ b/common/get-passphrase.c @@ -130,17 +130,6 @@ default_inq_cb (void *opaque, const char *line) } -static gpg_error_t -membuf_data_cb (void *opaque, const void *buffer, size_t length) -{ - membuf_t *data = opaque; - - if (buffer) - put_membuf (data, buffer, length); - return 0; -} - - /* Ask for a passphrase via gpg-agent. On success the caller needs to free the string stored at R_PASSPHRASE. On error NULL will be stored at R_PASSPHRASE and an appropriate gpg error code is @@ -214,7 +203,7 @@ gnupg_get_passphrase (const char *cache_id, else init_membuf (&data, 64); err = assuan_transact (agent_ctx, line, - membuf_data_cb, &data, + put_membuf_cb, &data, default_inq_cb, NULL, NULL, NULL); /* Older Pinentries return the old assuan error code for canceled |