From ed1f2700a73060e2615697491ea9e49ded4293e6 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 15 Sep 2016 10:45:04 +0200 Subject: core: New function gpgme_op_interact, deprecate gpgme_op_edit. * src/gpgme.h.in (gpgme_interact_cb_t): New. (GPGME_INTERACT_CARD): New. (gpgme_op_interact_start, gpgme_op_interact): New. * src/libgpgme.vers, src/gpgme.def: Add new functions. * src/edit.c (op_data_t): Rename fnc to fnc_old and change users. Add fnc. (edit_status_handler): Call old or new callback. (command_handler): Ditto. (interact_start): New. (gpgme_op_interact_start, gpgme_op_interact_start): New. * src/status-table.c (_gpgme_status_to_string): New. * tests/gpg/t-edit.c (edit_fnc): Rename to interact_fnc and change type of STATUS. Use gpgme_io_writen. (main): s/gpgme_op_edit/gpgme_op_interact/. -- This change will eventually allow us to remove all those status codes from gpgme.h. Signed-off-by: Werner Koch --- tests/gpg/t-edit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/gpg/t-edit.c') diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index 8b5f7cb6..7b444fa0 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -55,7 +55,7 @@ flush_data (gpgme_data_t dh) gpgme_error_t -edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd) +interact_fnc (void *opaque, const char *status, const char *args, int fd) { const char *result = NULL; gpgme_data_t out = (gpgme_data_t) opaque; @@ -63,7 +63,7 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd) fputs ("[-- Response --]\n", stdout); flush_data (out); - fprintf (stdout, "[-- Code: %i, %s --]\n", status, args); + fprintf (stdout, "[-- Code: %s, %s --]\n", status, args); if (fd >= 0) { @@ -103,8 +103,8 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd) if (result) { - gpgme_io_write (fd, result, strlen (result)); - gpgme_io_write (fd, "\n", 1); + gpgme_io_writen (fd, result, strlen (result)); + gpgme_io_writen (fd, "\n", 1); } return 0; } @@ -141,7 +141,7 @@ main (int argc, char **argv) err = gpgme_op_keylist_end (ctx); fail_if_err (err); - err = gpgme_op_edit (ctx, key, edit_fnc, out, out); + err = gpgme_op_interact (ctx, key, 0, interact_fnc, out, out); fail_if_err (err); fputs ("[-- Last response --]\n", stdout); -- cgit v1.2.3