cov: convert some more enternal field masks

Some more 'internal' masks misusing enums for bitfields.

diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 58f1caa58e1aa58da324e316dee3fa0299e36ca4..27b19ea3c338a359f76aa0514a402307d3286b91 100644 (file)
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -200,7 +200,7 @@ struct message_data {
        char *dso_name;         /* Name of DSO. */
        char *device_uuid;      /* Mapped device path. */
        char *events_str;       /* Events string as fetched from message. */
-       enum dm_event_mask events_field;        /* Events bitfield. */
+       unsigned events_field;  /* Events bitfield. */
        uint32_t timeout_secs;
        char *timeout_str;
        struct dm_event_daemon_message *msg;    /* Pointer to message buffer. */

diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 370d65f46f5e054149a774e1bacc27e24452907f..08df7270f51d230952219208d756142b032afb84 100644 (file)
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -753,7 +753,7 @@ static char *_fetch_string(char **src, const int delimiter)
 
 /* Parse a device message from the daemon. */
 static int _parse_message(struct dm_event_daemon_message *msg, char **dso_name,
-                        char **uuid, enum dm_event_mask *evmask)
+                        char **uuid, unsigned *evmask)
 {
        char *id;
        char *p = msg->data;
@@ -778,7 +778,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
        int ret = 0;
        const char *uuid = NULL;
        char *reply_dso = NULL, *reply_uuid = NULL;
-       enum dm_event_mask reply_mask = 0;
+       unsigned reply_mask = 0;
        struct dm_task *dmt = NULL;
        struct dm_event_daemon_message msg = { 0 };
        struct dm_info info;

diff --git a/lib/config/config.c b/lib/config/config.c
index 653015874e2f06c33125184630e796e441f6fc8a..5b3a5999a131be3f9ffeecb8ef6f3f16a7c8e076 100644 (file)
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -687,7 +687,7 @@ int config_def_get_path(char *buf, size_t buf_size, int id)
        return _cfg_def_make_path(buf, buf_size, id, cfg_def_get_item_p(id), 0);
 }
 
-static void _get_type_name(char *buf, size_t buf_size, cfg_def_type_t type)
+static void _get_type_name(char *buf, size_t buf_size, unsigned type)
 {
        (void) dm_snprintf(buf, buf_size, "%s%s%s%s%s%s",
                           (type & CFG_TYPE_ARRAY) ?
@@ -700,8 +700,8 @@ static void _get_type_name(char *buf, size_t buf_size, cfg_def_type_t type)
                           (type & CFG_TYPE_STRING) ? " string" : "");
 }
 
-static void _log_type_error(const char *path, cfg_def_type_t actual,
-                           cfg_def_type_t expected, int suppress_messages)
+static void _log_type_error(const char *path, unsigned actual, unsigned expected,
+                           int suppress_messages)
 {
        static char actual_type_name[128];
        static char expected_type_name[128];