projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: Move `create_posix_shm()` to common/shm.c
[lttng-tools.git]
/
src
/
common
/
trace-chunk.c
diff --git
a/src/common/trace-chunk.c
b/src/common/trace-chunk.c
index 75d1738d9ee2f4c38e0137f9e6779b4ec350943d..8a8481b5d41e4ce77e0dbf21a53347d0fa39198a 100644
(file)
--- a/
src/common/trace-chunk.c
+++ b/
src/common/trace-chunk.c
@@
-966,8
+966,8
@@
enum lttng_trace_chunk_status lttng_trace_chunk_get_credentials(
pthread_mutex_lock(&chunk->lock);
if (chunk->credentials.is_set) {
if (chunk->credentials.value.use_current_user) {
pthread_mutex_lock(&chunk->lock);
if (chunk->credentials.is_set) {
if (chunk->credentials.value.use_current_user) {
-
credentials->uid = geteuid(
);
-
credentials->gid = getegid(
);
+
LTTNG_OPTIONAL_SET(&credentials->uid, geteuid()
);
+
LTTNG_OPTIONAL_SET(&credentials->gid, getegid()
);
} else {
*credentials = chunk->credentials.value.user;
}
} else {
*credentials = chunk->credentials.value.user;
}
@@
-1834,7
+1834,12
@@
bool lttng_trace_chunk_ids_equal(const struct lttng_trace_chunk *chunk_a,
{
bool equal = false;
{
bool equal = false;
- if (!chunk_a || !chunk_b) {
+ if (chunk_a == chunk_b) {
+ equal = true;
+ goto end;
+ }
+
+ if (!!chunk_a ^ !!chunk_b) {
goto end;
}
goto end;
}
This page took
0.024 seconds
and
4
git commands to generate.