diff options
author | Werner Koch <[email protected]> | 2016-05-27 13:25:03 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-05-27 13:34:22 +0000 |
commit | 96c7901ec1c79be732570811223d3ea54875abfe (patch) | |
tree | 4dd77c0d37a0f4047d703d115099e3619f8adf0a /tools/gpgconf-comp.c | |
parent | gpg: Keep current and total of PROGESS status lines small enough. (diff) | |
download | gnupg-96c7901ec1c79be732570811223d3ea54875abfe.tar.gz gnupg-96c7901ec1c79be732570811223d3ea54875abfe.zip |
common: Make use of default_errsource in exechelp.
* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
Use them instead of gpg_error and gpg_error_from_syserror.
(create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
OUTBOUND which has a wrong name. Adjust callers.
(gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
DEFAULT_ERRSOURCE.
* common/exechelp-w32.c (gnupg_spawn_process): Ditto.
* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
* common/exectool.c (gnupg_exec_tool_stream): Do not pass
GPG_ERROR_FROM_SYSERROR.
* tools/gpgconf-comp.c (gc_component_check_options): Ditto.
(retrieve_options_from_program): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 4dd10a4c9..5d4a26a5c 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1626,7 +1626,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file) result = 0; errlines = NULL; - err = gnupg_spawn_process (pgmname, argv, GPG_ERR_SOURCE_DEFAULT, NULL, 0, + err = gnupg_spawn_process (pgmname, argv, NULL, 0, NULL, NULL, &errfp, &pid); if (err) result |= 1; /* Program could not be run. */ @@ -1965,7 +1965,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend) argv[0] = "--gpgconf-list"; argv[1] = NULL; - err = gnupg_spawn_process (pgmname, argv, GPG_ERR_SOURCE_DEFAULT, NULL, 0, + err = gnupg_spawn_process (pgmname, argv, NULL, 0, NULL, &outfp, NULL, &pid); if (err) { |