From d6862ec51014cec810ef63f0213d2e47e7637ec1 Mon Sep 17 00:00:00 2001
From: Rocco Rutte <pdmef@gmx.net>
Date: Thu, 18 Sep 2008 08:28:51 +0200
Subject: [PATCH] Fix compiler warnings

---
 ChangeLog | 14 ++++++++++++++
 alias.c   |  6 +++---
 init.c    |  4 ++--
 muttlib.c |  2 +-
 protos.h  |  2 ++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 784e779af..74f136bb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-17 22:27 +0200  Thomas Roessler  <roessler@does-not-exist.org>  (77e25415a08a)
+
+	* alias.c, globals.h, init.c, mutt_idna.c, muttlib.c, rfc822.h,
+	sort.c: sorting efficiency
+
+2008-09-16 17:20 +0200  Rocco Rutte  <pdmef@gmx.net>  (1cb0a127eb3d)
+
+	* UPDATING: UPDATING: $move now defaults to "no"
+
+2008-09-11 09:28 +0200  Rocco Rutte  <pdmef@gmx.net>  (1a6842983357)
+
+	* ChangeLog, keymap.c: Fix IMAP keepalive if $imap_keepalive >=
+	$timeout
+
 2008-09-01 18:23 +0200  Rocco Rutte  <pdmef@gmx.net>  (17adea9cdff6)
 
 	* UPDATING: Add note about locale-safe hcaches to UPDATING as it's a
diff --git a/alias.c b/alias.c
index 520c8b1b9..1583f3102 100644
--- a/alias.c
+++ b/alias.c
@@ -332,7 +332,7 @@ retry_name:
     return;
   }
 
-  alias_add_reverse (new);
+  mutt_alias_add_reverse (new);
   
   if ((t = Aliases))
   {
@@ -448,7 +448,7 @@ ADDRESS *alias_reverse_lookup (ADDRESS *a)
   return hash_find (ReverseAlias, a->mailbox);
 }
 
-void alias_add_reverse (ALIAS *t)
+void mutt_alias_add_reverse (ALIAS *t)
 {
   ADDRESS *ap;
   if (!t)
@@ -461,7 +461,7 @@ void alias_add_reverse (ALIAS *t)
   }
 }
 
-void alias_delete_reverse (ALIAS *t)
+void mutt_alias_delete_reverse (ALIAS *t)
 {
   ADDRESS *ap;
   if (!t)
diff --git a/init.c b/init.c
index f2c5be8c1..fc6fbbcf9 100644
--- a/init.c
+++ b/init.c
@@ -1336,7 +1336,7 @@ static int parse_alias (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
   }
   else
   {
-    alias_delete_reverse (tmp);
+    mutt_alias_delete_reverse (tmp);
     /* override the previous value */
     rfc822_free_address (&tmp->addr);
     if (CurrentMenu == MENU_ALIAS)
@@ -1361,7 +1361,7 @@ static int parse_alias (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
   }
 
   mutt_group_context_add_adrlist (gc, tmp->addr);
-  alias_add_reverse (tmp);
+  mutt_alias_add_reverse (tmp);
 
 #ifdef DEBUG
   if (debuglevel >= 2) 
diff --git a/muttlib.c b/muttlib.c
index edee887a8..212cf795b 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -746,7 +746,7 @@ void mutt_free_alias (ALIAS **p)
   {
     t = *p;
     *p = (*p)->next;
-    alias_delete_reverse (t);
+    mutt_alias_delete_reverse (t);
     FREE (&t->name);
     rfc822_free_address (&t->addr);
     FREE (&t);
diff --git a/protos.h b/protos.h
index a9edf4cba..4d29d4dc9 100644
--- a/protos.h
+++ b/protos.h
@@ -265,6 +265,8 @@ int mutt_add_to_rx_list (RX_LIST **list, const char *s, int flags, BUFFER *err);
 int mutt_addr_is_user (ADDRESS *);
 int mutt_addwch (wchar_t);
 int mutt_alias_complete (char *, size_t);
+void mutt_alias_add_reverse (ALIAS *t);
+void mutt_alias_delete_reverse (ALIAS *t);
 int mutt_alloc_color (int fg, int bg);
 int mutt_any_key_to_continue (const char *);
 int mutt_buffy_check (int);
-- 
2.50.0