From 74d9c310d1650511b230b1d07397780b551a7aea Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <sdaoden@users.sf.net>
Date: Sat, 10 May 2014 22:52:07 +0200
Subject: [PATCH] imap_search.c: GCC 4.9 warnings

---
 imap_search.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/imap_search.c b/imap_search.c
index 6e66081a..f9b41dcc 100644
--- a/imap_search.c
+++ b/imap_search.c
@@ -677,7 +677,8 @@ mkenvelope(struct name *np)
    char *ep, *realnam = NULL, *sourceaddr = NULL, *localpart = NULL,
       *domainpart = NULL, *cp, *rp, *xp, *ip;
    struct str in, out;
-   int level = 0, hadphrase = 0;
+   int level = 0;
+   bool_t hadphrase = FAL0;
    NYD_ENTER;
 
    in.s = np->n_fullname;
@@ -706,13 +707,14 @@ mkenvelope(struct name *np)
          }
          while (xp < cp)
             *rp++ = *xp++;
-         hadphrase = 1;
+         hadphrase = TRU1;
          goto jdone;
       case '(':
          if (level++)
             goto jdfl;
-         if (hadphrase++ == 0)
+         if (!hadphrase)
             rp = ip;
+         hadphrase = TRU1;
          break;
       case ')':
          if (--level)
-- 
2.11.4.GIT