X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fgetenv.c;h=ea8edbcdf5244878f5a7fd4f900068f0502e4fe7;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=b4dc73a004e872ed928eb528381fe72b1dc6777b;hpb=6f626d284c2bb02ae8980da6e8053e191d604286;p=lttng-ust.git

diff --git a/liblttng-ust/getenv.c b/liblttng-ust/getenv.c
index b4dc73a0..ea8edbcd 100644
--- a/liblttng-ust/getenv.c
+++ b/liblttng-ust/getenv.c
@@ -1,27 +1,16 @@
 /*
- * Copyright (C) 2017 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2017 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "getenv.h"
 
 enum lttng_env_secure {
@@ -50,7 +39,7 @@ static struct lttng_env lttng_env[] = {
 	/* Env. var. which are not fetched in setuid/setgid executables. */
 	{ "LTTNG_UST_CLOCK_PLUGIN", LTTNG_ENV_SECURE, NULL, },
 	{ "LTTNG_UST_GETCPU_PLUGIN", LTTNG_ENV_SECURE, NULL, },
-	{ "LTTNG_UST_BLOCKING_RETRY_TIMEOUT", LTTNG_ENV_SECURE, NULL, },
+	{ "LTTNG_UST_ALLOW_BLOCKING", LTTNG_ENV_SECURE, NULL, },
 	{ "HOME", LTTNG_ENV_SECURE, NULL, },
 	{ "LTTNG_HOME", LTTNG_ENV_SECURE, NULL, },
 };
@@ -61,7 +50,7 @@ int lttng_is_setuid_setgid(void)
 	return geteuid() != getuid() || getegid() != getgid();
 }
 
-char *lttng_getenv(const char *name)
+char *lttng_ust_getenv(const char *name)
 {
 	size_t i;
 	struct lttng_env *e;