diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-11-15 15:35:17 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-11-15 15:35:17 +0900 |
| commit | 523e3cbfe29f5665ebfac205f1a6d88bf7a3df87 (patch) | |
| tree | b570a5331c70307e2cdd9965f3989aafdcaa6bde /src/assuan-socket-connect.c | |
| parent | 05eb70c54969191c6833901d8af6a52d17d0adea (diff) | |
| download | libassuan-523e3cbfe29f5665ebfac205f1a6d88bf7a3df87.tar.gz | |
w32: Fix confusion between process ID and process HANDLE.
* src/assuan-defs.h (struct assuan_context_s): Rename to process_id.
* src/assuan-pipe-connect.c (initial_handshake): Fix variable name
and access to the member field.
* src/assuan-socket-connect.c (_assuan_connect_finalize): Likewise.
* src/system-w32.c (get_file_handle): Likewise.
(w32_fdpass_send): Likewise.
--
Fixes-commit: ba84b780df973ba7ca7f7c51fbd1b6d1a69b8c01
GnuPG-bug-id: 6236
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'src/assuan-socket-connect.c')
| -rw-r--r-- | src/assuan-socket-connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c index 629399e..2d3405f 100644 --- a/src/assuan-socket-connect.c +++ b/src/assuan-socket-connect.c @@ -135,7 +135,7 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd, { #if defined(HAVE_W64_SYSTEM) || defined(HAVE_W32_SYSTEM) const char *line = ctx->inbound.line + off; - int process_handle = ASSUAN_INVALID_PID; + int process_id = -1; /* Parse the message: OK ..., process %i */ line = strchr (line, ','); @@ -146,11 +146,11 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd, { line = strchr (line + 1, ' '); if (line) - process_handle = atoi (line + 1); + process_id = atoi (line + 1); } } - if (process_handle != ASSUAN_INVALID_PID) - ctx->process_handle = process_handle; + if (process_id != -1) + ctx->process_id = process_id; #else ; #endif |