File bsc#1133866-0001-Refactor-controller-make-proce... of Package pacemaker.21356

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1133866-0001-Refactor-controller-make-process_lrm_event-void-1.1.patch of Package pacemaker.21356

From 48198ca839b62de1316d7ae6ab0994dedb37b523 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Tue, 27 Nov 2018 17:00:25 -0600
Subject: [PATCH 1/2] Refactor: controller: make process_lrm_event() void

All callers ignored the return value
---
 crmd/crmd_lrm.h | 3 ++-
 crmd/lrm.c      | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crmd/crmd_lrm.h b/crmd/crmd_lrm.h
index d11505679..3e1596d8f 100644
--- a/crmd/crmd_lrm.h
+++ b/crmd/crmd_lrm.h
@@ -170,4 +170,5 @@ gboolean remote_ra_is_in_maintenance(lrm_state_t * lrm_state);
 void remote_ra_process_maintenance_nodes(xmlNode *xml);
 gboolean remote_ra_controlling_guest(lrm_state_t * lrm_state);
 
-gboolean process_lrm_event(lrm_state_t * lrm_state, lrmd_event_data_t * op, struct recurring_op_s *pending);
+void process_lrm_event(lrm_state_t *lrm_state, lrmd_event_data_t *op,
+                       struct recurring_op_s *pending);
diff --git a/crmd/lrm.c b/crmd/lrm.c
index d18665c70..5e5af9f68 100644
--- a/crmd/lrm.c
+++ b/crmd/lrm.c
@@ -2515,7 +2515,7 @@ unescape_newlines(const char *string)
     return ret;
 }
 
-gboolean
+void
 process_lrm_event(lrm_state_t * lrm_state, lrmd_event_data_t * op, struct recurring_op_s *pending)
 {
     char *op_id = NULL;
@@ -2526,8 +2526,8 @@ process_lrm_event(lrm_state_t * lrm_state, lrmd_event_data_t * op, struct recurr
     gboolean removed = FALSE;
     lrmd_rsc_info_t *rsc = NULL;
 
-    CRM_CHECK(op != NULL, return FALSE);
-    CRM_CHECK(op->rsc_id != NULL, return FALSE);
+    CRM_CHECK(op != NULL, return);
+    CRM_CHECK(op->rsc_id != NULL, return);
 
     op_id = make_stop_id(op->rsc_id, op->call_id);
     op_key = generate_op_key(op->rsc_id, op->op_type, op->interval);
@@ -2679,6 +2679,4 @@ process_lrm_event(lrm_state_t * lrm_state, lrmd_event_data_t * op, struct recurr
     lrmd_free_rsc_info(rsc);
     free(op_key);
     free(op_id);
-
-    return TRUE;
 }
-- 
2.16.4

Places

File bsc#1133866-0001-Refactor-controller-make-process_lrm_event-void-1.1.patch of Package pacemaker.21356

Places