global: Don't use ENUM_NEGATE() with non-enum variables

Fixes compiler warnings.

diff --git a/src/doveadm/dsync/dsync-transaction-log-scan.c b/src/doveadm/dsync/dsync-transaction-log-scan.c
index 428d59c716f96ad736efe3d5f5b6d1fdeb80ba8b..9e0bfe0a6f2b03c1fc7238fc29effd57f1205fb1 100644 (file)
--- a/src/doveadm/dsync/dsync-transaction-log-scan.c
+++ b/src/doveadm/dsync/dsync-transaction-log-scan.c
@@ -179,9 +179,9 @@ log_add_flag_update(struct dsync_transaction_log_scan *ctx, const void *data,
                                        DSYNC_MAIL_CHANGE_TYPE_FLAG_CHANGE,
                                        &change)) {
                                change->add_flags |= rec->add_flags;
-                               change->remove_flags &= ENUM_NEGATE(rec->add_flags);
+                               change->remove_flags &= ~rec->add_flags;
                                change->remove_flags |= rec->remove_flags;
-                               change->add_flags &= ENUM_NEGATE(rec->remove_flags);
+                               change->add_flags &= ~rec->remove_flags;
                        }
                }
        }

diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c
index 097bd45168a541fdb4264fd04a768b5007bef902..983083efa46d6032c0cb841e5f154fda1638db3e 100644 (file)
--- a/src/lib-index/mail-index-sync.c
+++ b/src/lib-index/mail-index-sync.c
@@ -998,7 +998,7 @@ void mail_index_sync_flags_apply(const struct mail_index_sync_rec *sync_rec,
 {
        i_assert(sync_rec->type == MAIL_INDEX_SYNC_TYPE_FLAGS);
 
-       *flags = (*flags & ENUM_NEGATE(sync_rec->remove_flags)) | sync_rec->add_flags;
+       *flags = (*flags & ~sync_rec->remove_flags) | sync_rec->add_flags;
 }
 
 bool mail_index_sync_keywords_apply(const struct mail_index_sync_rec *sync_rec,

diff --git a/src/lib-index/mail-index-transaction-update.c b/src/lib-index/mail-index-transaction-update.c
index dfceaf23e58b6e224a0d09317e62ec03ae7ad81e..8158e4480e3fbb80dc528545ddd87c7982ed1ca9 100644 (file)
--- a/src/lib-index/mail-index-transaction-update.c
+++ b/src/lib-index/mail-index-transaction-update.c
@@ -500,10 +500,10 @@ mail_index_insert_flag_update(struct mail_index_transaction *t,
 
                updates[idx].add_flags =
                        (updates[idx].add_flags | u.add_flags) &
-                       ENUM_NEGATE(u.remove_flags);
+                       ~u.remove_flags;
                updates[idx].remove_flags =
                        (updates[idx].remove_flags | u.remove_flags) &
-                       ENUM_NEGATE(u.add_flags);
+                       ~u.add_flags;
                u.uid1 = updates[idx].uid2 + 1;
 
                if (updates[idx].add_flags == 0 &&

diff --git a/src/lib-index/mail-index-transaction-view.c b/src/lib-index/mail-index-transaction-view.c
index 240c7fedaee722a4b79ea7c218d1afc1c7c5f91e..34b69ecac63f779124f3cf7390de0d52a2fcad5f 100644 (file)
--- a/src/lib-index/mail-index-transaction-view.c
+++ b/src/lib-index/mail-index-transaction-view.c
@@ -122,7 +122,7 @@ tview_apply_flag_updates(struct mail_index_view_transaction *tview,
        trec = PTR_OFFSET(tview->recs, (seq-1) * tview->record_size);
        memcpy(trec, rec, map->hdr.record_size);
        trec->flags |= updates[idx].add_flags & 0xff;
-       trec->flags &= ENUM_NEGATE(updates[idx].remove_flags);
+       trec->flags &= ~updates[idx].remove_flags;
        return trec;
 }
 

diff --git a/src/lib-index/mail-index-view-sync.c b/src/lib-index/mail-index-view-sync.c
index d8a57936d66cea7bd5e01f1916398e499125bd68..58caaf6b127ea8b159559da9ab73682d2a6f8393 100644 (file)
--- a/src/lib-index/mail-index-view-sync.c
+++ b/src/lib-index/mail-index-view-sync.c
@@ -369,7 +369,7 @@ static int view_sync_apply_lost_changes(struct mail_index_view_sync_ctx *ctx,
                i_zero(&flag_update);
                flag_update.uid1 = flag_update.uid2 = new_rec->uid;
                flag_update.add_flags = new_rec->flags;
-               flag_update.remove_flags = ENUM_NEGATE(new_rec->flags) & 0xff;
+               flag_update.remove_flags = ~new_rec->flags & 0xff;
                if (mail_index_sync_record(&ctx->sync_map_ctx, &thdr,
                                           &flag_update) < 0)
                        return -1;

diff --git a/src/plugins/acl/acl-cache.c b/src/plugins/acl/acl-cache.c
index f91d09467dd26d1cb7e530f63b9c1d096cb5a387..38c33676fdd28b28b429c0558aec98964a5c8eda 100644 (file)
--- a/src/plugins/acl/acl-cache.c
+++ b/src/plugins/acl/acl-cache.c
@@ -235,7 +235,7 @@ acl_cache_update_rights_mask(struct acl_cache *cache,
                /* remove changed bits from old mask */
                size = I_MIN(old_mask->size, change_mask->size);
                for (i = 0; i < size; i++)
-                       old_mask->mask[i] &= ENUM_NEGATE(change_mask->mask[i]);
+                       old_mask->mask[i] &= ~change_mask->mask[i];
                break;
        case ACL_MODIFY_MODE_REPLACE:
                if (old_mask == NULL && change_mask == NULL)
@@ -359,7 +359,7 @@ acl_cache_my_current_rights_recalculate(struct acl_object_cache *obj_cache)
                /* apply the negative rights. they override positive rights. */
                size = I_MIN(mask->size, obj_cache->my_neg_rights->size);
                for (i = 0; i < size; i++)
-                       mask->mask[i] &= ENUM_NEGATE(obj_cache->my_neg_rights->mask[i]);
+                       mask->mask[i] &= ~obj_cache->my_neg_rights->mask[i];
        }
 
        obj_cache->my_current_rights = mask;