From bbbb7933d7f01f22319303c406bd5e9a5ff14307 Mon Sep 17 00:00:00 2001 From: Sumanth Nirmal Date: Thu, 10 Mar 2022 23:52:31 -0800 Subject: [PATCH] Resolve merge conflicts Signed-off-by: Sumanth Nirmal --- src/core/ddsc/src/shm_monitor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/ddsc/src/shm_monitor.c b/src/core/ddsc/src/shm_monitor.c index 2987fab65a..cd7c109a5f 100644 --- a/src/core/ddsc/src/shm_monitor.c +++ b/src/core/ddsc/src/shm_monitor.c @@ -33,10 +33,8 @@ static void shm_subscriber_callback(iox_sub_t subscriber, void * context_data); void shm_monitor_init(shm_monitor_t* monitor) { // storage is ignored internally now but we cannot pass a nullptr - iox_listener_storage_t s; - monitor->m_listener = iox_listener_init(&s); - iox_user_trigger_storage_t t; - monitor->m_wakeup_trigger = iox_user_trigger_init(&t); + monitor->m_listener = iox_listener_init(&(iox_listener_storage_t){0}); + monitor->m_wakeup_trigger = iox_user_trigger_init(&(iox_user_trigger_storage_t){0}); monitor->m_state = SHM_MONITOR_RUNNING; }