Merge pull request #3972 from clumens/enum-refactor

Change how enums are defined.

Author: nrwahl2

daemons/attrd/pacemaker-attrd.h

@@ -11,6 +11,7 @@
 #  define PACEMAKER_ATTRD__H
 
 #include <regex.h>
+#include <stdint.h>
 #include <glib.h>
 #include <crm/crm.h>
 #include <crm/cluster.h>
@@ -114,19 +115,19 @@ void attrd_remove_voter(const pcmk__node_status_t *peer);
 void attrd_xml_add_writer(xmlNode *xml);
 
 enum attrd_attr_flags {
-    attrd_attr_none         = 0U,
+    attrd_attr_none         = 0,
 
     // At least one of attribute's values has changed since last write
-    attrd_attr_changed      = (1U << 0),
+    attrd_attr_changed      = (UINT32_C(1) << 0),
 
     // At least one of attribute's values has an unknown node XML ID
-    attrd_attr_node_unknown = (1U << 1),
+    attrd_attr_node_unknown = (UINT32_C(1) << 1),
 
     // This attribute should never be written to the CIB
-    attrd_attr_is_private   = (1U << 2),
+    attrd_attr_is_private   = (UINT32_C(1) << 2),
 
     // Ignore any configured delay for next write of this attribute
-    attrd_attr_force_write  = (1U << 3),
+    attrd_attr_force_write  = (UINT32_C(1) << 3),
 };
 
 typedef struct attribute_s {
@@ -154,9 +155,13 @@ typedef struct attribute_s {
     } while (0)
 
 enum attrd_value_flags {
-    attrd_value_none        = 0U,
-    attrd_value_remote      = (1U << 0),  // Value is for Pacemaker Remote node
-    attrd_value_from_peer   = (1U << 1),  // Value is from peer sync response
+    attrd_value_none        = 0,
+
+    //! Value is for Pacemaker Remote node
+    attrd_value_remote      = (UINT32_C(1) << 0),
+
+    //! Value is from peer sync response
+    attrd_value_from_peer   = (UINT32_C(1) << 1),
 };
 
 typedef struct attribute_value_s {
@@ -214,8 +219,8 @@ char *attrd_nvpair_id(const attribute_t *attr, const char *node_state_id);
 
 enum attrd_write_options {
     attrd_write_changed         = 0,
-    attrd_write_all             = (1 << 0),
-    attrd_write_no_delay        = (1 << 1),
+    attrd_write_all             = (UINT32_C(1) << 0),
+    attrd_write_no_delay        = (UINT32_C(1) << 1),
 };
 
 void attrd_write_attributes(uint32_t options);

daemons/controld/controld_control.c

@@ -479,35 +479,35 @@ do_started(long long action,
 
     } else if (!pcmk__is_set(controld_globals.fsa_input_register,
                              R_MEMBERSHIP)) {
-        crm_info("Delaying start, no membership data (%.16llx)", R_MEMBERSHIP);
+        crm_info("Delaying start, no membership data (%.16" PRIx64 ")", R_MEMBERSHIP);
 
         crmd_fsa_stall(TRUE);
         return;
 
     } else if (!pcmk__is_set(controld_globals.fsa_input_register,
                              R_LRM_CONNECTED)) {
-        crm_info("Delaying start, not connected to executor (%.16llx)", R_LRM_CONNECTED);
+        crm_info("Delaying start, not connected to executor (%.16" PRIx64 ")", R_LRM_CONNECTED);
 
         crmd_fsa_stall(TRUE);
         return;
 
     } else if (!pcmk__is_set(controld_globals.fsa_input_register,
                              R_CIB_CONNECTED)) {
-        crm_info("Delaying start, CIB not connected (%.16llx)", R_CIB_CONNECTED);
+        crm_info("Delaying start, CIB not connected (%.16" PRIx64 ")", R_CIB_CONNECTED);
 
         crmd_fsa_stall(TRUE);
         return;
 
     } else if (!pcmk__is_set(controld_globals.fsa_input_register,
                              R_READ_CONFIG)) {
-        crm_info("Delaying start, Config not read (%.16llx)", R_READ_CONFIG);
+        crm_info("Delaying start, Config not read (%.16" PRIx64 ")", R_READ_CONFIG);
 
         crmd_fsa_stall(TRUE);
         return;
 
     } else if (!pcmk__is_set(controld_globals.fsa_input_register,
                              R_PEER_DATA)) {
-        crm_info("Delaying start, No peer data (%.16llx)", R_PEER_DATA);
+        crm_info("Delaying start, No peer data (%.16" PRIx64 ")", R_PEER_DATA);
         crmd_fsa_stall(TRUE);
         return;
     }

daemons/controld/controld_election.c

@@ -213,7 +213,6 @@ do_dc_takeover(long long action,
     controld_execute_fencing_cleanup();
 
     election_reset(controld_globals.cluster);
-    controld_set_fsa_input_flags(R_JOIN_OK|R_INVOKE_PE);
 
     controld_globals.cib_conn->cmds->set_primary(controld_globals.cib_conn,
                                                  cib_none);