[Pkg-gnupg-commit] [libassuan] 145/437: 2005-10-01 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 2a5f006308d7da5809eceb7c084de98e54466882
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Sat Oct 1 20:15:45 2005 +0000

    2005-10-01  Marcus Brinkmann  <marcus at g10code.de>
    
    	* assuan.h (assuan_pipe_connect, assuan_pipe_connect2): Make type
    	of ARGV parameter const in prototype.
    	* assuan-pipe-connect.c (assuan_pipe_connect,
    	assuan_pipe_connect2): Likewise in declaration.
    	(assuan_pipe_connect2): Add braindead cast to make execv happy.
---
 src/ChangeLog             |  6 ++++++
 src/assuan-pipe-connect.c | 10 +++++-----
 src/assuan.h              |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 4460708..a52ab02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2005-10-01  Marcus Brinkmann  <marcus at g10code.de>
 
+	* assuan.h (assuan_pipe_connect, assuan_pipe_connect2): Make type
+	of ARGV parameter const in prototype.
+	* assuan-pipe-connect.c (assuan_pipe_connect,
+	assuan_pipe_connect2): Likewise in declaration.
+	(assuan_pipe_connect2): Add braindead cast to make execv happy.
+
 	* assuan-client.c (assuan_transact): Change LINE, S and D from
 	unsigned char * to char * to silence gcc warning.
 	* assuan-util.c (_assuan_log_sanitized_string): Add explicit cast
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index cbc131f..ecedb16 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -1,5 +1,5 @@
 /* assuan-pipe-connect.c - Establish a pipe connection (client) 
- *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ *	Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
  *
  * This file is part of Assuan.
  *
@@ -245,7 +245,7 @@ create_inheritable_pipe (int filedes[2], int for_write)
    function should only act if the second value is 0. */
 assuan_error_t
 assuan_pipe_connect2 (assuan_context_t *ctx,
-                      const char *name, char *const argv[],
+                      const char *name, const char *const argv[],
                       int *fd_child_list,
                       void (*atfork) (void *opaque, int reserved),
                       void *atforkvalue)
@@ -554,7 +554,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
              initialized. */
           setenv ("_assuan_pipe_connect_pid", mypidstr, 1);
 
-          execv (name, argv); 
+          execv (name, (char *const *) argv); 
           /* oops - use the pipe to tell the parent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
@@ -612,8 +612,8 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
    vector in ARGV.  FD_CHILD_LIST is a -1 terminated list of file
    descriptors not to close in the child.  */
 assuan_error_t
-assuan_pipe_connect (assuan_context_t *ctx, const char *name, char *const argv[],
-		     int *fd_child_list)
+assuan_pipe_connect (assuan_context_t *ctx, const char *name,
+		     const char *const argv[], int *fd_child_list)
 {
   return assuan_pipe_connect2 (ctx, name, argv, fd_child_list, NULL, NULL);
 }
diff --git a/src/assuan.h b/src/assuan.h
index e72c6d0..8fa5550 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -332,9 +332,11 @@ int assuan_init_connected_socket_server (assuan_context_t *r_ctx, int fd);
 
 /*-- assuan-pipe-connect.c --*/
 assuan_error_t assuan_pipe_connect (assuan_context_t *ctx, const char *name,
-                                 char *const argv[], int *fd_child_list);
+				    const char *const argv[],
+				    int *fd_child_list);
 assuan_error_t assuan_pipe_connect2 (assuan_context_t *ctx, const char *name,
-                                     char *const argv[], int *fd_child_list,
+                                     const char *const argv[],
+				     int *fd_child_list,
                                      void (*atfork) (void*, int),
                                      void *atforkvalue);
 /*-- assuan-socket-connect.c --*/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git