projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Namespace lttng/align.h macros
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-elf.c
diff --git
a/liblttng-ust/lttng-ust-elf.c
b/liblttng-ust/lttng-ust-elf.c
index c073e7a545b64d349d3d7bb56932a24b9025f657..a02ba8d9eb38e3eb418f02dd82f53c270694f03c 100644
(file)
--- a/
liblttng-ust/lttng-ust-elf.c
+++ b/
liblttng-ust/lttng-ust-elf.c
@@
-16,18
+16,20
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#define _LGPL_SOURCE
+#include <fcntl.h>
#include <helper.h>
#include <helper.h>
-#include <string.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
-#include <sys/types.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/stat.h>
-#include <
fcntl
.h>
+#include <
sys/types
.h>
#include <unistd.h>
#include <unistd.h>
-#include <stdbool.h>
+
#include <ust-fd.h>
#include <ust-fd.h>
+
#include "lttng-tracer-core.h"
#define BUF_LEN 4096
#include "lttng-tracer-core.h"
#define BUF_LEN 4096
@@
-250,6
+252,8
@@
struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
goto error;
}
goto error;
}
+ /* Initialize fd field to -1. 0 is a valid fd number */
+ elf->fd = -1;
elf->path = strdup(path);
if (!elf->path) {
elf->path = strdup(path);
if (!elf->path) {
@@
-445,7
+449,7
@@
int lttng_ust_elf_get_build_id_from_segment(
size_t read_len;
/* Align start of note entry */
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;
}
if (offset >= segment_end) {
break;
}
@@
-470,7
+474,7
@@
int lttng_ust_elf_get_build_id_from_segment(
offset += sizeof(nhdr) + nhdr.n_namesz;
/* Align start of desc entry */
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) {
/*
if (nhdr.n_type != NT_GNU_BUILD_ID) {
/*
This page took
0.024542 seconds
and
4
git commands to generate.