diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/engine-gpgconf.c | 3 | ||||
| -rw-r--r-- | src/gpgconf.c | 4 | ||||
| -rw-r--r-- | src/gpgme.h.in | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37a1e2dc..5664e449 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2010-11-23 Marcus Brinkmann <[email protected]> + + * gpgme.h.in (gpgme_conf_arg_new): Make VALUE arg const void *. + * gpgconf.c (_gpgme_conf_arg_new): Likewise. + (gpgme_conf_arg_new): Likewise. + * engine-gpgconf.c (_gpgme_conf_arg_new): Likewise. + (gpgconf_write): Remove debug hack. + 2010-11-19 Marcus Brinkmann <[email protected]> * engine-gpgconf.c (_gpgme_conf_opt_change): Support diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c index 44967f56..d08ed03c 100644 --- a/src/engine-gpgconf.c +++ b/src/engine-gpgconf.c @@ -537,7 +537,7 @@ gpgconf_conf_load (void *engine, gpgme_conf_comp_t *comp_p) gpgme_error_t _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, - gpgme_conf_type_t type, void *value) + gpgme_conf_type_t type, const void *value) { gpgme_conf_arg_t arg; @@ -660,7 +660,6 @@ gpgconf_write (void *engine, char *arg1, char *arg2, gpgme_data_t conf) /* _gpgme_engine_new guarantees that this is not NULL. */ argv[0] = gpgconf->file_name; - argv[0] = "/nowhere/path-needs-to-be-fixed/gpgconf"; if (_gpgme_io_pipe (rp, 0) < 0) return gpg_error_from_syserror (); diff --git a/src/gpgconf.c b/src/gpgconf.c index 8fdf68ee..3c9d16b5 100644 --- a/src/gpgconf.c +++ b/src/gpgconf.c @@ -30,7 +30,7 @@ #ifdef ENABLE_GPGCONF /* engine-gpgconf.c. */ gpgme_error_t _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, - gpgme_conf_type_t type, void *value); + gpgme_conf_type_t type, const void *value); void _gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type); gpgme_error_t _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg); @@ -44,7 +44,7 @@ gpgme_error_t gpgme_op_conf_save (gpgme_ctx_t ctx, gpgme_conf_comp_t comp); /* Allocate a new gpgme_conf_arg_t. */ gpgme_error_t gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, - gpgme_conf_type_t type, void *value) + gpgme_conf_type_t type, const void *value) { #ifdef ENABLE_GPGCONF return _gpgme_conf_arg_new (arg_p, type, value); diff --git a/src/gpgme.h.in b/src/gpgme.h.in index f84cd465..a70ff2ad 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -1999,7 +1999,7 @@ typedef struct gpgme_conf_comp to the string. Else, it should point to an unsigned or signed integer respectively. */ gpgme_error_t gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, - gpgme_conf_type_t type, void *value); + gpgme_conf_type_t type, const void *value); /* This also releases all chained argument structures! */ void gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type); |