Resolve merge conflicts

sumanth-nirmal · sumanth-nirmal · commit fa197545cf54 · 2022-03-10T23:53:34.000-08:00
Signed-off-by: Sumanth Nirmal &lt;sumanth.724@gmail.com&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,8 @@ static void shm_subscriber_callback(iox_sub_t subscriber, void * context_data);`
`33`	`33`	`void shm_monitor_init(shm_monitor_t* monitor)`
`34`	`34`	`{`
`35`	`35`	`// storage is ignored internally now but we cannot pass a nullptr`
`36`		`- iox_listener_storage_t s;`
`37`		`- monitor->m_listener = iox_listener_init(&s);`
`38`		`- iox_user_trigger_storage_t t;`
`39`		`- monitor->m_wakeup_trigger = iox_user_trigger_init(&t);`
	`36`	`+ monitor->m_listener = iox_listener_init(&(iox_listener_storage_t){0});`
	`37`	`+ monitor->m_wakeup_trigger = iox_user_trigger_init(&(iox_user_trigger_storage_t){0});`
`40`	`38`
`41`	`39`	`monitor->m_state = SHM_MONITOR_RUNNING;`
`42`	`40`	`}`