From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 23 Nov 2010 09:46:52 +0000 (+0000)
Subject: 2010-11-23  Marcus Brinkmann  <mb@g10code.com>
X-Git-Tag: gpgme-1.3.1~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eff0b7766ac364283f2fff48b5747d37ea1cf4eb;p=gpgme.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 37a1e2d..5664e44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
 	* engine-gpgconf.c (_gpgme_conf_opt_change): Support
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 44967f5..d08ed03 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 8fdf68e..3c9d16b 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 f84cd46..a70ff2a 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);