From: Federico Kircheis <federico.kircheis@gmail.com>
Date: Wed, 10 Jul 2019 18:30:30 +0000 (+0200)
Subject: Make const discards more explicit
X-Git-Tag: 2019-10-25~144^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01b43446563019616477efc4c90e0cea2bbe06b7;p=neomutt

Make const discards more explicit
---

diff --git a/imap/imap.c b/imap/imap.c
index 2c1c4059a..1751e5171 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -984,9 +984,10 @@ bool imap_has_flag(struct ListHead *flag_list, const char *flag)
  */
 static int compare_uid(const void *a, const void *b)
 {
-  struct Email **ea = (struct Email **) a;
-  struct Email **eb = (struct Email **) b;
-  return imap_edata_get(*ea)->uid - imap_edata_get(*eb)->uid;
+  const struct Email *ea = *(struct Email const *const *) a;
+  const struct Email *eb = *(struct Email const *const *) b;
+  return imap_edata_get((struct Email *) ea)->uid -
+         imap_edata_get((struct Email *) eb)->uid;
 }
 
 /**
diff --git a/nntp/nntp.c b/nntp/nntp.c
index 58c96c10f..4448f1c3a 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -2367,11 +2367,11 @@ int nntp_check_children(struct Context *ctx, const char *msgid)
  */
 int nntp_compare_order(const void *a, const void *b)
 {
-  struct Email **ea = (struct Email **) a;
-  struct Email **eb = (struct Email **) b;
+  const struct Email *ea = *(struct Email const *const *) a;
+  const struct Email *eb = *(struct Email const *const *) b;
 
-  anum_t na = nntp_edata_get(*ea)->article_num;
-  anum_t nb = nntp_edata_get(*eb)->article_num;
+  anum_t na = nntp_edata_get((struct Email *) ea)->article_num;
+  anum_t nb = nntp_edata_get((struct Email *) eb)->article_num;
   int result = (na == nb) ? 0 : (na > nb) ? 1 : -1;
   result = perform_auxsort(result, a, b);
   return SORT_CODE(result);