From 929e941c10903b80c933e483a1610240bd52286d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 9 Feb 2021 15:59:53 +0900 Subject: Imported Upstream version 2.1.0 --- common/session-env.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'common/session-env.h') diff --git a/common/session-env.h b/common/session-env.h index 031fe1d..1173ed5 100644 --- a/common/session-env.h +++ b/common/session-env.h @@ -3,12 +3,22 @@ * * This file is part of GnuPG. * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This file is free software; you can redistribute it and/or modify + * it under the terms of either * - * GnuPG is distributed in the hope that it will be useful, + * - the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at + * your option) any later version. + * + * or + * + * - the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * or both in parallel, as here. + * + * This file is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -23,20 +33,20 @@ struct session_environment_s; typedef struct session_environment_s *session_env_t; -const char *session_env_list_stdenvnames (int *iterator, +const char *session_env_list_stdenvnames (int *iterator, const char **r_assname); session_env_t session_env_new (void); void session_env_release (session_env_t se); gpg_error_t session_env_putenv (session_env_t se, const char *string); -gpg_error_t session_env_setenv (session_env_t se, +gpg_error_t session_env_setenv (session_env_t se, const char *name, const char *value); char *session_env_getenv (session_env_t se, const char *name); char *session_env_getenv_or_default (session_env_t se, const char *name, int *r_default); -char *session_env_listenv (session_env_t se, int *iterator, +char *session_env_listenv (session_env_t se, int *iterator, const char **r_value, int *r_default); -- cgit v1.2.3