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

2005-10-01 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2005-10-01 20:17:03 +00:00
parent 7f6ad15cbe
commit fbf6ece78b
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assuan/ChangeLog
View File

@ -1,5 +1,11 @@
2005-10-01 Marcus Brinkmann <marcus@g10code.de> 2005-10-01 Marcus Brinkmann <marcus@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 * assuan-client.c (assuan_transact): Change LINE, S and D from
unsigned char * to char * to silence gcc warning. unsigned char * to char * to silence gcc warning.
* assuan-util.c (_assuan_log_sanitized_string): Add explicit cast * assuan-util.c (_assuan_log_sanitized_string): Add explicit cast

10
assuan/assuan-pipe-connect.c
View File

@ -1,5 +1,5 @@
/* assuan-pipe-connect.c - Establish a pipe connection (client) /* 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. * 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. */ function should only act if the second value is 0. */
assuan_error_t assuan_error_t
assuan_pipe_connect2 (assuan_context_t *ctx, assuan_pipe_connect2 (assuan_context_t *ctx,
const char *name, char *const argv[], const char *name, const char *const argv[],
int *fd_child_list, int *fd_child_list,
void (*atfork) (void *opaque, int reserved), void (*atfork) (void *opaque, int reserved),
void *atforkvalue) void *atforkvalue)
@ -554,7 +554,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
initialized. */ initialized. */
setenv ("_assuan_pipe_connect_pid", mypidstr, 1); 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 */ /* oops - use the pipe to tell the parent about it */
snprintf (errbuf, sizeof(errbuf)-1, snprintf (errbuf, sizeof(errbuf)-1,
"ERR %d can't exec `%s': %.50s\n", "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 vector in ARGV. FD_CHILD_LIST is a -1 terminated list of file
descriptors not to close in the child. */ descriptors not to close in the child. */
assuan_error_t assuan_error_t
assuan_pipe_connect (assuan_context_t *ctx, const char *name, char *const argv[], assuan_pipe_connect (assuan_context_t *ctx, const char *name,
int *fd_child_list) const char *const argv[], int *fd_child_list)
{ {
return assuan_pipe_connect2 (ctx, name, argv, fd_child_list, NULL, NULL); return assuan_pipe_connect2 (ctx, name, argv, fd_child_list, NULL, NULL);
} }

6
assuan/assuan.h
View File

@ -365,9 +365,11 @@ int assuan_init_connected_socket_server (assuan_context_t *r_ctx, int fd);
/*-- assuan-pipe-connect.c --*/ /*-- assuan-pipe-connect.c --*/
assuan_error_t assuan_pipe_connect (assuan_context_t *ctx, const char *name, 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, 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 (*atfork) (void*, int),
void *atforkvalue); void *atforkvalue);
/*-- assuan-socket-connect.c --*/ /*-- assuan-socket-connect.c --*/