mutt_addr_is_user

diff --git a/alias.c b/alias.c
index 41db5dc566c1c1d52141c7fb0ffae88eff20ca28..5b76a072666d86c7a3fe9a3573073c6ee764805b 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -610,7 +610,7 @@ static int string_is_address(const char *str, const char *u, const char *d)
 }
 
 /* returns true if the given address belongs to the user. */
-int mutt_addr_is_user (ADDRESS *addr)
+bool mutt_addr_is_user (ADDRESS *addr)
 {
   const char *fqdn = NULL;
 
@@ -618,46 +618,46 @@ int mutt_addr_is_user (ADDRESS *addr)
   if (!addr)
   {
     mutt_debug (5, "mutt_addr_is_user: yes, NULL address\n");
-    return 1;
+    return true;
   }
   if (!addr->mailbox)
   {
     mutt_debug (5, "mutt_addr_is_user: no, no mailbox\n");
-    return 0;
+    return false;
   }
 
   if (ascii_strcasecmp (addr->mailbox, Username) == 0)
   {
     mutt_debug (5, "mutt_addr_is_user: yes, %s = %s\n",
                 addr->mailbox, Username);
-    return 1;
+    return true;
   }
   if (string_is_address(addr->mailbox, Username, Hostname))
   {
     mutt_debug (5, "mutt_addr_is_user: yes, %s = %s @ %s \n",
                 addr->mailbox, Username, Hostname);
-    return 1;
+    return true;
   }
   fqdn = mutt_fqdn (0);
   if (string_is_address(addr->mailbox, Username, fqdn))
   {
     mutt_debug (5, "mutt_addr_is_user: yes, %s = %s @ %s \n",
                 addr->mailbox, Username, NONULL(fqdn));
-    return 1;
+    return true;
   }
   fqdn = mutt_fqdn (1);
   if (string_is_address(addr->mailbox, Username, fqdn))
   {
     mutt_debug (5, "mutt_addr_is_user: yes, %s = %s @ %s \n",
                 addr->mailbox, Username, NONULL(fqdn));
-    return 1;
+    return true;
   }
 
   if (From && (ascii_strcasecmp (From->mailbox, addr->mailbox) == 0))
   {
     mutt_debug (5, "mutt_addr_is_user: yes, %s = %s\n",
                 addr->mailbox, From->mailbox);
-    return 1;
+    return true;
   }
 
   if (mutt_match_rx_list (addr->mailbox, Alternates))
@@ -668,9 +668,9 @@ int mutt_addr_is_user (ADDRESS *addr)
       mutt_debug (5, "mutt_addr_is_user: but, %s matched by unalternates.\n",
                   addr->mailbox);
     else
-      return 1;
+      return true;
   }
 
   mutt_debug (5, "mutt_addr_is_user: no, all failed.\n");
-  return 0;
+  return false;
 }

diff --git a/hdrline.c b/hdrline.c
index 1341b8308fa5f5dc6056c25cb4a00a87ecaab4aa..e2b392d449bbbf08fa11a7a97af28a48b917be69 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -205,7 +205,7 @@ static void make_from (ENVELOPE *env, char *buf, size_t len, int do_lists)
   if (!env || !buf)
     return;
 
-  int me;
+  bool me;
   enum FieldType disp;
   ADDRESS *name = NULL;
 
@@ -253,7 +253,7 @@ static void make_from_addr (ENVELOPE *hdr, char *buf, size_t len, int do_lists)
   if (!hdr || !buf)
     return;
 
-  int me = mutt_addr_is_user (hdr->from);
+  bool me = mutt_addr_is_user (hdr->from);
 
   if (do_lists || me)
   {

diff --git a/hook.c b/hook.c
index e7ddd14ece819a57777878d3fd2b77ff1ad10e32..814f3400c15d29ff3410df29c8c459a326dbec4a 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -441,7 +441,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER *hdr)
     char tmp[_POSIX_PATH_MAX];
     ADDRESS *adr = NULL;
     ENVELOPE *env = hdr->env;
-    int fromMe = mutt_addr_is_user (env->from);
+    bool fromMe = mutt_addr_is_user (env->from);
 
     if (!fromMe && env->reply_to && env->reply_to->mailbox)
       adr = env->reply_to;

diff --git a/protos.h b/protos.h
index 9f09395676e7d28246ffeb702b0bb06a47e7076f..99456ffa360cf61ff6d43c641f374eaaf0c9fe6d 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -273,7 +273,7 @@ void mutt_view_attachments(HEADER *hdr);
 void mutt_write_address_list(ADDRESS *adr, FILE *fp, int linelen, int display);
 void mutt_set_virtual(CONTEXT *ctx);
 int mutt_add_to_rx_list(RX_LIST **list, const char *s, int flags, BUFFER *err);
-int mutt_addr_is_user(ADDRESS *addr);
+bool mutt_addr_is_user(ADDRESS *addr);
 int mutt_addwch(wchar_t wc);
 int mutt_alias_complete(char *s, size_t buflen);
 void mutt_alias_add_reverse(ALIAS *t);