diff options
| -rw-r--r-- | src/gpg-error.def.in | 2 | ||||
| -rw-r--r-- | src/gpg-error.h.in | 4 | ||||
| -rw-r--r-- | src/gpg-error.vers | 2 | ||||
| -rw-r--r-- | src/gpgrt-int.h | 4 | ||||
| -rw-r--r-- | src/spawn-posix.c | 4 | ||||
| -rw-r--r-- | src/spawn-w32.c | 4 | ||||
| -rw-r--r-- | src/visibility.c | 6 | ||||
| -rw-r--r-- | src/visibility.h | 4 | ||||
| -rw-r--r-- | tests/t-spawn.c | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in index 3b9f462..4344cbc 100644 --- a/src/gpg-error.def.in +++ b/src/gpg-error.def.in @@ -254,6 +254,6 @@ EXPORTS gpgrt_spawn_actions_set_envvars @194 gpgrt_spawn_actions_set_redirect @195 gpgrt_spawn_actions_set_inherit_handles @196 - gpgrt_spawn_actions_set_envchange @197 + gpgrt_spawn_actions_set_env_rev @197 ;; end of file with public symbols for Windows. diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in index 44566ae..8d4dd66 100644 --- a/src/gpg-error.h.in +++ b/src/gpg-error.h.in @@ -1120,8 +1120,8 @@ typedef struct gpgrt_process *gpgrt_process_t; typedef struct gpgrt_spawn_actions *gpgrt_spawn_actions_t; gpg_err_code_t gpgrt_spawn_actions_new (gpgrt_spawn_actions_t *r_act); void gpgrt_spawn_actions_release (gpgrt_spawn_actions_t act); -void gpgrt_spawn_actions_set_envchange (gpgrt_spawn_actions_t, - const char *const*); +void gpgrt_spawn_actions_set_env_rev (gpgrt_spawn_actions_t, + const char *const*); @define:spawn_actions_functions@ enum gpgrt_process_requests diff --git a/src/gpg-error.vers b/src/gpg-error.vers index 2868f3c..e340a5f 100644 --- a/src/gpg-error.vers +++ b/src/gpg-error.vers @@ -221,7 +221,7 @@ GPG_ERROR_1.0 { gpgrt_spawn_actions_set_redirect; gpgrt_spawn_actions_set_inherit_fds; gpgrt_spawn_actions_set_atfork; - gpgrt_spawn_actions_set_envchange; + gpgrt_spawn_actions_set_env_rev; local: *; diff --git a/src/gpgrt-int.h b/src/gpgrt-int.h index 55933a1..5df3a95 100644 --- a/src/gpgrt-int.h +++ b/src/gpgrt-int.h @@ -637,8 +637,8 @@ gpg_err_code_t _gpgrt_make_pipe (int filedes[2], estream_t *r_fp, /* Actions (at spawning a child process), which is OS-specific. */ gpg_err_code_t _gpgrt_spawn_actions_new (gpgrt_spawn_actions_t *r_act); void _gpgrt_spawn_actions_release (gpgrt_spawn_actions_t act); -void _gpgrt_spawn_actions_set_envchange (gpgrt_spawn_actions_t, - const char *const*); +void _gpgrt_spawn_actions_set_env_rev (gpgrt_spawn_actions_t, + const char *const*); #ifdef HAVE_W32_SYSTEM void _gpgrt_spawn_actions_set_envvars (gpgrt_spawn_actions_t, char *); void _gpgrt_spawn_actions_set_redirect (gpgrt_spawn_actions_t, diff --git a/src/spawn-posix.c b/src/spawn-posix.c index 4bb90ca..0cdf0a6 100644 --- a/src/spawn-posix.c +++ b/src/spawn-posix.c @@ -484,8 +484,8 @@ _gpgrt_spawn_actions_set_environ (gpgrt_spawn_actions_t act, } void -_gpgrt_spawn_actions_set_envchange (gpgrt_spawn_actions_t act, - const char *const *envchange) +_gpgrt_spawn_actions_set_env_rev (gpgrt_spawn_actions_t act, + const char *const *envchange) { act->envchange = envchange; } diff --git a/src/spawn-w32.c b/src/spawn-w32.c index c21ac4b..435e9f6 100644 --- a/src/spawn-w32.c +++ b/src/spawn-w32.c @@ -675,8 +675,8 @@ _gpgrt_spawn_actions_release (gpgrt_spawn_actions_t act) } void -_gpgrt_spawn_actions_set_envchange (gpgrt_spawn_actions_t act, - const char *const *envchange) +_gpgrt_spawn_actions_set_env_rev (gpgrt_spawn_actions_t act, + const char *const *envchange) { act->envchange = envchange; } diff --git a/src/visibility.c b/src/visibility.c index 15b38b4..b7505b8 100644 --- a/src/visibility.c +++ b/src/visibility.c @@ -1146,10 +1146,10 @@ gpgrt_spawn_actions_release (gpgrt_spawn_actions_t act) } void -gpgrt_spawn_actions_set_envchange (gpgrt_spawn_actions_t act, - const char *const *env) +gpgrt_spawn_actions_set_env_rev (gpgrt_spawn_actions_t act, + const char *const *env) { - _gpgrt_spawn_actions_set_envchange (act, env); + _gpgrt_spawn_actions_set_env_rev (act, env); } #ifdef HAVE_W32_SYSTEM diff --git a/src/visibility.h b/src/visibility.h index 748a42a..30c6853 100644 --- a/src/visibility.h +++ b/src/visibility.h @@ -231,7 +231,7 @@ MARK_VISIBLE (gpgrt_absfnameconcat) MARK_VISIBLE (gpgrt_spawn_actions_new) MARK_VISIBLE (gpgrt_spawn_actions_release) -MARK_VISIBLE (gpgrt_spawn_actions_set_envchange) +MARK_VISIBLE (gpgrt_spawn_actions_set_env_rev) #ifdef HAVE_W32_SYSTEM MARK_VISIBLE (gpgrt_spawn_actions_set_envvars) MARK_VISIBLE (gpgrt_spawn_actions_set_redirect) @@ -424,7 +424,7 @@ MARK_VISIBLE (gpgrt_spawn_actions_set_atfork) #define gpgrt_spawn_actions_new _gpgrt_USE_UNDERSCORED_FUNCTION #define gpgrt_spawn_actions_release _gpgrt_USE_UNDERSCORED_FUNCTION -#define gpgrt_spawn_actions_set_envchange _gpgrt_USE_UNDERSCORED_FUNCTION +#define gpgrt_spawn_actions_set_env_rev _gpgrt_USE_UNDERSCORED_FUNCTION #ifdef HAVE_W32_SYSTEM #define gpgrt_spawn_actions_set_envvars _gpgrt_USE_UNDERSCORED_FUNCTION #define gpgrt_spawn_actions_set_redirect _gpgrt_USE_UNDERSCORED_FUNCTION diff --git a/tests/t-spawn.c b/tests/t-spawn.c index 96c890a..51a328c 100644 --- a/tests/t-spawn.c +++ b/tests/t-spawn.c @@ -74,7 +74,7 @@ run_test (const char *progname) fail ("gpgrt_spawn_actions_new failed at %d: %s", __LINE__, gpg_strerror (rc)); - gpgrt_spawn_actions_set_envchange (act, envchange); + gpgrt_spawn_actions_set_env_rev (act, envchange); rc = gpgrt_process_spawn (progname, argv1, (GPGRT_PROCESS_STDIN_KEEP |