[balsa/balsa-2.5-gmime-2.6] Resolve some scan-build warnings

[Peter Bloomfield <peterb src gnome org>]

commit 908574ea5bf99492ead3eed33dad50899cdbd3bf
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Apr 16 17:55:40 2020 -0400

    Resolve some scan-build warnings
    
    * libbalsa/address-book-gpe.c:
    * libbalsa/address-book-ldap.c (libbalsa_address_book_ldap_load),
      (libbalsa_address_book_ldap_remove_address),
      (libbalsa_address_book_ldap_modify_address),
      (libbalsa_address_book_ldap_alias_complete):
    * libbalsa/imap/imap-handle.c (ir_envelope):
    * src/ab-main.c (file_delete_activated):

 ChangeLog                    | 12 ++++++++++++
 libbalsa/address-book-gpe.c  |  3 +--
 libbalsa/address-book-ldap.c | 16 ++++++----------
 libbalsa/imap/imap-handle.c  | 16 ++++++++--------
 src/ab-main.c                |  2 +-
 5 files changed, 28 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5fe29a6a3..efda9fc7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,18 @@
        * src/sendmsg-window.c (add_attachment): Insert separators
          between logically distinct sections of the popup menu.
 
+2020-04-16  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Resolve some scan-build warnings
+
+       * libbalsa/address-book-gpe.c:
+       * libbalsa/address-book-ldap.c (libbalsa_address_book_ldap_load),
+       (libbalsa_address_book_ldap_remove_address),
+       (libbalsa_address_book_ldap_modify_address),
+       (libbalsa_address_book_ldap_alias_complete):
+       * libbalsa/imap/imap-handle.c (ir_envelope):
+       * src/ab-main.c (file_delete_activated):
+
 2020-04-11  Pawel Salek  <pawsa0 gmail com>
 
        * NEWS, configure.ac, meson.build: release balsa-2.6.0
diff --git a/libbalsa/address-book-gpe.c b/libbalsa/address-book-gpe.c
index c909e0d6b..8558c845d 100644
--- a/libbalsa/address-book-gpe.c
+++ b/libbalsa/address-book-gpe.c
@@ -630,8 +630,7 @@ libbalsa_address_book_gpe_modify_address(LibBalsaAddressBook *ab,
 
     /* do the real work here */
 #ifdef HAVE_SQLITE3
-    if ((r = sqlite3_exec(ab_gpe->db, "begin transaction",
-                          NULL, NULL, &err)) != SQLITE_OK) {
+    if (sqlite3_exec(ab_gpe->db, "begin transaction", NULL, NULL, &err) != SQLITE_OK) {
         libbalsa_address_book_set_status(ab, err);
         sqlite3_free(err);              /* failed, so soon!? */
         return LBABERR_CANNOT_WRITE;
diff --git a/libbalsa/address-book-ldap.c b/libbalsa/address-book-ldap.c
index a357d20ef..19150b205 100644
--- a/libbalsa/address-book-ldap.c
+++ b/libbalsa/address-book-ldap.c
@@ -429,13 +429,12 @@ libbalsa_address_book_ldap_load(LibBalsaAddressBook * ab,
     /*
      * Connect to the server.
      */
-    for(attempt=0; attempt<2; attempt++) {
+    for (attempt = 0; attempt < 2; attempt++) {
         if (ab_ldap->directory == NULL) {
-            if ((rc=libbalsa_address_book_ldap_open_connection(ab_ldap))
-                != LDAP_SUCCESS)
+            if (libbalsa_address_book_ldap_open_connection(ab_ldap) != LDAP_SUCCESS)
                 return LBABERR_CANNOT_CONNECT;
         }
-        
+
         /* 
          * Attempt to search for e-mail addresses. It returns success 
          * or failure, but not all the matches. 
@@ -751,8 +750,7 @@ libbalsa_address_book_ldap_remove_address(LibBalsaAddressBook *ab,
     g_return_val_if_fail(addr != NULL, LBABERR_CANNOT_WRITE);
 
     if (ab_ldap->directory == NULL) {
-        if( (rc=libbalsa_address_book_ldap_open_connection(ab_ldap))
-           != LDAP_SUCCESS)
+        if (libbalsa_address_book_ldap_open_connection(ab_ldap) != LDAP_SUCCESS)
            return LBABERR_CANNOT_CONNECT;
     }
 
@@ -826,8 +824,7 @@ libbalsa_address_book_ldap_modify_address(LibBalsaAddressBook *ab,
     /* the email address has not changed, continue with changing other
      * attributes. */
     if (ab_ldap->directory == NULL) {
-        if ((rc = libbalsa_address_book_ldap_open_connection(ab_ldap))
-           != LDAP_SUCCESS)
+        if (libbalsa_address_book_ldap_open_connection(ab_ldap) != LDAP_SUCCESS)
            return LBABERR_CANNOT_CONNECT;
     }
 
@@ -1059,8 +1056,7 @@ libbalsa_address_book_ldap_alias_complete(LibBalsaAddressBook * ab,
         return NULL;
 
     if (ab_ldap->directory == NULL) {
-        if( (rc=libbalsa_address_book_ldap_open_connection(ab_ldap))
-           != LDAP_SUCCESS)
+        if (libbalsa_address_book_ldap_open_connection(ab_ldap) != LDAP_SUCCESS)
            return NULL;
     }
 
diff --git a/libbalsa/imap/imap-handle.c b/libbalsa/imap/imap-handle.c
index 62e87cd81..ecdf63682 100644
--- a/libbalsa/imap/imap-handle.c
+++ b/libbalsa/imap/imap-handle.c
@@ -3084,28 +3084,28 @@ ir_envelope(NetClientSioBuf *sio, ImapEnvelope *env)
     if(env) env->date = g_mime_utils_header_decode_date(date, NULL);
     g_free(date);
   }
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   str = imap_get_nstring(sio);
   if(env) env->subject = str; else g_free(str);
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->from : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->sender : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->replyto : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->to : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->cc : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   if(imap_get_addr_list(sio, env ? &env->bcc : NULL) != IMR_OK)
     return IMR_PROTOCOL;
-  if( (c=sio_getc(sio)) != ' ') return IMR_PROTOCOL;
+  if(sio_getc(sio) != ' ') return IMR_PROTOCOL;
   str = imap_get_nstring(sio);
   if(env) env->in_reply_to = str; else g_free(str);
   if( (c=sio_getc(sio)) != ' ') { g_debug("c=%c",c); return IMR_PROTOCOL;}
diff --git a/src/ab-main.c b/src/ab-main.c
index 752bfab11..3e86e6242 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -462,7 +462,7 @@ file_delete_activated(GSimpleAction * action,
     if (!list)
         return;
 
-    contacts_app.address_book = list->data;
+    contacts_app.address_book = address_book;
     set_address_book_menu_items();
 }