diff options
Diffstat (limited to 'src/engine-gpgconf.c')
| -rw-r--r-- | src/engine-gpgconf.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c index a2407ac..90f32c7 100644 --- a/src/engine-gpgconf.c +++ b/src/engine-gpgconf.c @@ -90,11 +90,14 @@ gpgconf_release (void *engine) static gpgme_error_t -gpgconf_new (void **engine, const char *file_name, const char *home_dir) +gpgconf_new (void **engine, const char *file_name, const char *home_dir, + const char *version) { gpgme_error_t err = 0; engine_gpgconf_t gpgconf; + (void)version; /* Not yet used. */ + gpgconf = calloc (1, sizeof *gpgconf); if (!gpgconf) return gpg_error_from_syserror (); @@ -197,7 +200,7 @@ gpgconf_config_release (gpgme_conf_comp_t conf) allow for quite a long "group" line, which is usually the longest line (mine is currently ~3k). */ static gpgme_error_t -gpgconf_read (void *engine, char *arg1, char *arg2, +gpgconf_read (void *engine, const char *arg1, char *arg2, gpgme_error_t (*cb) (void *hook, char *line), void *hook) { @@ -214,7 +217,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2, int nread; char *mark = NULL; - argv[1] = arg1; + argv[1] = (char*)arg1; argv[2] = arg2; @@ -675,14 +678,14 @@ _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg) /* FIXME: Major problem: We don't get errors from gpgconf. */ static gpgme_error_t -gpgconf_write (void *engine, char *arg1, char *arg2, gpgme_data_t conf) +gpgconf_write (void *engine, const char *arg1, char *arg2, gpgme_data_t conf) { struct engine_gpgconf *gpgconf = engine; gpgme_error_t err = 0; #define BUFLEN 1024 char buf[BUFLEN]; int buflen = 0; - char *argv[] = { NULL /* file_name */, arg1, arg2, 0 }; + char *argv[] = { NULL /* file_name */, (char*)arg1, arg2, 0 }; int rp[2]; struct spawn_fd_item_s cfd[] = { {-1, 0 /* STDIN_FILENO */}, {-1, -1} }; int status; @@ -909,6 +912,8 @@ gpgconf_conf_save (void *engine, gpgme_conf_comp_t comp) static void gpgconf_set_io_cbs (void *engine, gpgme_io_cbs_t io_cbs) { + (void)engine; + (void)io_cbs; /* Nothing to do. */ } @@ -934,6 +939,7 @@ struct engine_ops _gpgme_engine_ops_gpgconf = /* Member functions. */ gpgconf_release, NULL, /* reset */ + NULL, /* set_status_cb */ NULL, /* set_status_handler */ NULL, /* set_command_handler */ NULL, /* set_colon_line_handler */ @@ -951,6 +957,8 @@ struct engine_ops _gpgme_engine_ops_gpgconf = NULL, /* import */ NULL, /* keylist */ NULL, /* keylist_ext */ + NULL, /* keysign */ + NULL, /* tofu_policy */ NULL, /* sign */ NULL, /* trustlist */ NULL, /* verify */ |