X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-elf.c;h=fc4029c93c78377d2cb37dd80eea047d7d56eb59;hb=ea8efbbe07e4b524fb308963ff5b0868fa14806f;hp=b7c0acb5d0d04c7def84ed4de4bfa85eadf3f0e3;hpb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index b7c0acb5..fc4029c9 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -1,24 +1,12 @@
 /*
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * 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; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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) 2015 Antoine Busque <abusque@efficios.com>
  */
 
 #define _LGPL_SOURCE
 #include <fcntl.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/align.h>
 #include <lttng/ust-elf.h>
 #include <stdbool.h>
@@ -31,6 +19,8 @@
 #include <ust-fd.h>
 
 #include "lttng-tracer-core.h"
+#include "lttng-ust-elf.h"
+#include "ust-helper.h"
 
 #define BUF_LEN	4096
 
@@ -449,7 +439,7 @@ int lttng_ust_elf_get_build_id_from_segment(
 		size_t read_len;
 
 		/* Align start of note entry */
-		offset += offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
+		offset += lttng_ust_offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
 		if (offset >= segment_end) {
 			break;
 		}
@@ -474,7 +464,7 @@ int lttng_ust_elf_get_build_id_from_segment(
 
 		offset += sizeof(nhdr) + nhdr.n_namesz;
 		/* Align start of desc entry */
-		offset += offset_align(offset, ELF_NOTE_DESC_ALIGN);
+		offset += lttng_ust_offset_align(offset, ELF_NOTE_DESC_ALIGN);
 
 		if (nhdr.n_type != NT_GNU_BUILD_ID) {
 			/*