mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Silence compiler warnings related to not using assuan_fd_t.
* common/call-gpg.c (start_gpg): Use assuan_fd_t. Note that the declaration was already fixed by a previous change. * dirmngr/server.c (cmd_getinfo): Use assuan_fd_t. -- Note that this matters only for Windows and it does not harm as long as we can only build for 32 bit Windows withsizeof(int)==sizeof(void*). Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
022342e284
commit
501436ab0f
@ -47,7 +47,7 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
|
||||
assuan_context_t ctx = NULL;
|
||||
const char *pgmname;
|
||||
const char **argv;
|
||||
int no_close_list[5];
|
||||
assuan_fd_t no_close_list[5];
|
||||
int i;
|
||||
char line[ASSUAN_LINELENGTH];
|
||||
|
||||
@ -100,7 +100,7 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
|
||||
no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
|
||||
if (output_fd != -1)
|
||||
no_close_list[i++] = assuan_fd_from_posix_fd (output_fd);
|
||||
no_close_list[i] = -1;
|
||||
no_close_list[i] = ASSUAN_INVALID_FD;
|
||||
|
||||
/* Connect to GPG and perform initial handshaking. */
|
||||
err = assuan_pipe_connect (ctx, gpg_program, argv, no_close_list,
|
||||
|
@ -2126,8 +2126,8 @@ cmd_getinfo (assuan_context_t ctx, char *line)
|
||||
#if ASSUAN_VERSION_NUMBER >= 0x020402
|
||||
/* Check whether we can connect to the proxy. We use a
|
||||
special feature introduced with libassuan 2.4.2. */
|
||||
int sock = assuan_sock_connect_byname (NULL, 0, 0, NULL,
|
||||
ASSUAN_SOCK_TOR);
|
||||
assuan_fd_t sock = assuan_sock_connect_byname (NULL, 0, 0, NULL,
|
||||
ASSUAN_SOCK_TOR);
|
||||
if (sock == ASSUAN_INVALID_FD)
|
||||
{
|
||||
err = assuan_write_status
|
||||
|
Loading…
x
Reference in New Issue
Block a user