Move to kernel style SPDX license identifiers

[lttng-ust.git] / liblttng-ust-dl / lttng-ust-dl.c

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index b0737b65f9f4222d6beef931b7ce3a07eef0ea1c..004a7ae266596fb939427bb79d9e2f16a6c6c21a 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -1,27 +1,15 @@
 /*
- * Copyright (C) 2013  Paul Woegerer <paul.woegerer@mentor.com>
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
- * Copyright (C) 2016  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; 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) 2013 Paul Woegerer <paul.woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -38,8 +26,10 @@
 #include "ust_dl.h"
 
 static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+#ifdef HAVE_DLMOPEN
 static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
                int flags);
+#endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
 static
@@ -55,6 +45,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
        return __lttng_ust_plibc_dlopen(filename, flags);
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
                int flags)
@@ -68,6 +59,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
        }
        return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
 }
+#endif
 
 static
 int _lttng_ust_dl_libc_dlclose(void *handle)
@@ -103,7 +95,7 @@ void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
 
        elf = lttng_ust_elf_create(resolved_path);
        if (!elf) {
-               ERR("could not acces file %s", resolved_path);
+               ERR("could not access file %s", resolved_path);
                return;
        }
 
@@ -143,6 +135,7 @@ end:
        return;
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
                int flags, void *ip)
@@ -164,7 +157,7 @@ void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
 
        elf = lttng_ust_elf_create(resolved_path);
        if (!elf) {
-               ERR("could not acces file %s", resolved_path);
+               ERR("could not access file %s", resolved_path);
                return;
        }
 
@@ -203,6 +196,7 @@ end:
        lttng_ust_elf_destroy(elf);
        return;
 }
+#endif
 
 void *dlopen(const char *filename, int flags)
 {
@@ -223,6 +217,7 @@ void *dlopen(const char *filename, int flags)
        return handle;
 }
 
+#ifdef HAVE_DLMOPEN
 void *dlmopen(Lmid_t nsid, const char *filename, int flags)
 {
        void *handle;
@@ -243,6 +238,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
        return handle;
 
 }
+#endif
 
 int dlclose(void *handle)
 {