Make const discards more explicit

diff --git a/imap/imap.c b/imap/imap.c
index 2c1c4059a94ed55a789cbc8be68f2da6c7304380..1751e517130854d06f697be31615b45ce4a73f19 100644 (file)
--- 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 58c96c10fbf41bb63fc76391b2fc69dcbb722c4a..4448f1c3a36973682179e014797aebd31cdc592a 100644 (file)
--- 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);