[svn] gpgme - r1509 - trunk/src

[svn author marcus]

Author: marcus
Date: 2010-11-23 10:46:52 +0100 (Tue, 23 Nov 2010)
New Revision: 1509

Modified:
   trunk/src/ChangeLog
   trunk/src/engine-gpgconf.c
   trunk/src/gpgconf.c
   trunk/src/gpgme.h.in
Log:
2010-11-23  Marcus Brinkmann  <mb at 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.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-11-19 16:06:43 UTC (rev 1508)
+++ trunk/src/ChangeLog	2010-11-23 09:46:52 UTC (rev 1509)
@@ -1,3 +1,11 @@
+2010-11-23  Marcus Brinkmann  <mb at 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 at g10code.com>
 
 	* engine-gpgconf.c (_gpgme_conf_opt_change): Support

Modified: trunk/src/engine-gpgconf.c
===================================================================
--- trunk/src/engine-gpgconf.c	2010-11-19 16:06:43 UTC (rev 1508)
+++ trunk/src/engine-gpgconf.c	2010-11-23 09:46:52 UTC (rev 1509)
@@ -537,7 +537,7 @@
 
 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 @@
 
   /* _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 ();

Modified: trunk/src/gpgconf.c
===================================================================
--- trunk/src/gpgconf.c	2010-11-19 16:06:43 UTC (rev 1508)
+++ trunk/src/gpgconf.c	2010-11-23 09:46:52 UTC (rev 1509)
@@ -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 @@
 /* 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);

Modified: trunk/src/gpgme.h.in
===================================================================
--- trunk/src/gpgme.h.in	2010-11-19 16:06:43 UTC (rev 1508)
+++ trunk/src/gpgme.h.in	2010-11-23 09:46:52 UTC (rev 1509)
@@ -1999,7 +1999,7 @@
    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);