GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-11-23 Marcus Brinkmann <mb@g10code.com>

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2010-11-23 09:46:52 +00:00
parent ed8c52941c
commit eff0b7766a
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2010-11-23 Marcus Brinkmann <mb@g10code.com>
* 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 <mb@g10code.com> 2010-11-19 Marcus Brinkmann <mb@g10code.com>
* engine-gpgconf.c (_gpgme_conf_opt_change): Support * engine-gpgconf.c (_gpgme_conf_opt_change): Support

3
src/engine-gpgconf.c
View File

@ -537,7 +537,7 @@ gpgconf_conf_load (void *engine, gpgme_conf_comp_t *comp_p)
gpgme_error_t gpgme_error_t
_gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, _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; 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. */ /* _gpgme_engine_new guarantees that this is not NULL. */
argv[0] = gpgconf->file_name; argv[0] = gpgconf->file_name;
argv[0] = "/nowhere/path-needs-to-be-fixed/gpgconf";
if (_gpgme_io_pipe (rp, 0) < 0) if (_gpgme_io_pipe (rp, 0) < 0)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();

4
src/gpgconf.c
View File

@ -30,7 +30,7 @@
#ifdef ENABLE_GPGCONF #ifdef ENABLE_GPGCONF
/* engine-gpgconf.c. */ /* engine-gpgconf.c. */
gpgme_error_t _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_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);
void _gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type); 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_error_t _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset,
gpgme_conf_arg_t arg); 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. */ /* Allocate a new gpgme_conf_arg_t. */
gpgme_error_t gpgme_error_t
gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p, 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 #ifdef ENABLE_GPGCONF
return _gpgme_conf_arg_new (arg_p, type, value); return _gpgme_conf_arg_new (arg_p, type, value);

2
src/gpgme.h.in
View File

@ -1999,7 +1999,7 @@ typedef struct gpgme_conf_comp
to the string. Else, it should point to an unsigned or signed to the string. Else, it should point to an unsigned or signed
integer respectively. */ integer respectively. */
gpgme_error_t gpgme_conf_arg_new (gpgme_conf_arg_t *arg_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);
/* This also releases all chained argument structures! */ /* This also releases all chained argument structures! */
void gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type); void gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type);