event-rule: Normalize pattern for syscall and tracepoint

[lttng-tools.git] / src / common / trace-chunk.c

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index b303607e348d8501133fe41a6b9b53683c35fc0f..327612ce283b1db9e00de1ea6bf8ec2fb81fb77d 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) {
-                       credentials->uid = geteuid();
-                       credentials->gid = getegid();
+                       LTTNG_OPTIONAL_SET(&credentials->uid, geteuid());
+                       LTTNG_OPTIONAL_SET(&credentials->gid, getegid());
                } else {
                        *credentials = chunk->credentials.value.user;
                }
@@ -1077,9 +1077,8 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
                 * A nameless chunk does not need its own output directory.
                 * The session's output directory will be used.
                 */
-               const bool reference_acquired =
-                               lttng_directory_handle_get(
-                                       session_output_directory);
+               reference_acquired = lttng_directory_handle_get(
+                               session_output_directory);
 
                assert(reference_acquired);
                chunk_directory_handle = session_output_directory;