notmuch: Eliminate some const-correctness warnings.

These were introduced as a side-effect of commit
b9eac48c22f53f84ed1d9c1d8ca862a7b638c9ac (shame on me for doing
side-effect commits like that!).

For me, at least, compilation is now warning-free.

diff --git a/notmuch-reply.c b/notmuch-reply.c
index aa58178573190a92dcfa5a615e587cf39ce739a4..23d04b8b1ea01083de530204bc4b95eeaaf130c5 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -119,7 +119,7 @@ static int
 address_is_users (const char *address, notmuch_config_t *config)
 {
     const char *primary;
 address_is_users (const char *address, notmuch_config_t *config)
 {
     const char *primary;

-    char **other;
+    const char **other;

     size_t i, other_len;
 
     primary = notmuch_config_get_user_primary_email (config);
     size_t i, other_len;
 
     primary = notmuch_config_get_user_primary_email (config);


@@ -312,7 +312,8 @@ static const char *
 guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
 {
     const char *received,*primary,*by;
 guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
 {
     const char *received,*primary,*by;

-    char **other,*tohdr;
+    const char **other;
+    char *tohdr;

     char *mta,*ptr,*token;
     char *domain=NULL;
     char *tld=NULL;
     char *mta,*ptr,*token;
     char *domain=NULL;
     char *tld=NULL;

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 955deb7e51330c633d1a1017de47e35742cc8d4c..ec4bfebc7e52c5fda803b301c84cfc43f55360d7 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -94,7 +94,7 @@ notmuch_setup_command (unused (void *ctx),
     char *response = NULL;
     size_t response_size;
     notmuch_config_t *config;
     char *response = NULL;
     size_t response_size;
     notmuch_config_t *config;

-    char **old_other_emails;
+    const char **old_other_emails;

     size_t old_other_emails_len;
     GPtrArray *other_emails;
     unsigned int i;
     size_t old_other_emails_len;
     GPtrArray *other_emails;
     unsigned int i;