[evolution-data-server] Address some of the clang warnings

[Milan Crha <mcrha src gnome org>]

commit 99329e2dacfa2f9a88da516a86c7ffc78740a22f
Author: Milan Crha <mcrha redhat com>
Date:   Mon May 14 18:18:19 2018 +0200

    Address some of the clang warnings

 .../backends/ldap/e-book-backend-ldap.c            |   30 ++++++++++++--------
 tests/libebook-contacts/test-phone-number.c        |    4 ++
 tests/libedata-cal/test-cal-cache-intervals.c      |    6 ++--
 3 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/src/addressbook/backends/ldap/e-book-backend-ldap.c 
b/src/addressbook/backends/ldap/e-book-backend-ldap.c
index 74887bd..0c82158 100644
--- a/src/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/src/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -1782,7 +1782,7 @@ modify_contact_search_handler (LDAPOp *op,
        } else if (msg_type == LDAP_RES_SEARCH_REFERENCE) {
                /* ignore references */
        } else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-               gchar *ldap_error_msg;
+               gchar *ldap_error_msg = NULL;
                gint ldap_error;
                gint new_dn_needed;
 
@@ -1803,7 +1803,8 @@ modify_contact_search_handler (LDAPOp *op,
                                ldap_error,
                                ldap_err2string (ldap_error), ldap_error_msg);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                if (ldap_error != LDAP_SUCCESS) {
                        /* more here i'm sure */
@@ -1896,7 +1897,7 @@ modify_contact_rename_handler (LDAPOp *op,
 {
        LDAPModifyOp *modify_op = (LDAPModifyOp *) op;
        EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (op->backend);
-       gchar *ldap_error_msg;
+       gchar *ldap_error_msg = NULL;
        gint ldap_error;
        LDAPMod **ldap_mods;
        gboolean differences;
@@ -1943,7 +1944,8 @@ modify_contact_rename_handler (LDAPOp *op,
                        if (bl->priv->cache)
                                e_book_backend_cache_add_contact (bl->priv->cache, modify_op->contact);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                if (ldap_error != LDAP_SUCCESS) {
                        e_data_book_respond_modify_contacts (op->book,
@@ -2152,7 +2154,7 @@ get_contact_handler (LDAPOp *op,
        } else if (msg_type == LDAP_RES_SEARCH_REFERENCE) {
                /* ignore references */
        } else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-               gchar *ldap_error_msg;
+               gchar *ldap_error_msg = NULL;
                gint ldap_error;
 
                g_rec_mutex_lock (&eds_ldap_handler_lock);
@@ -2170,7 +2172,8 @@ get_contact_handler (LDAPOp *op,
                                ldap_error,
                                ldap_err2string (ldap_error), ldap_error_msg);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                e_data_book_respond_get_contact (
                        op->book,
@@ -2266,7 +2269,7 @@ contact_list_handler (LDAPOp *op,
        } else if (msg_type == LDAP_RES_SEARCH_REFERENCE) {
                /* ignore references */
        } else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-               gchar *ldap_error_msg;
+               gchar *ldap_error_msg = NULL;
                gint ldap_error;
 
                g_rec_mutex_lock (&eds_ldap_handler_lock);
@@ -2284,7 +2287,8 @@ contact_list_handler (LDAPOp *op,
                                ldap_error,
                                ldap_err2string (ldap_error), ldap_error_msg);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                g_warning ("search returned %d\n", ldap_error);
 
@@ -2409,7 +2413,7 @@ contact_list_uids_handler (LDAPOp *op,
        } else if (msg_type == LDAP_RES_SEARCH_REFERENCE) {
                /* ignore references */
        } else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-               gchar *ldap_error_msg;
+               gchar *ldap_error_msg = NULL;
                gint ldap_error;
 
                g_rec_mutex_lock (&eds_ldap_handler_lock);
@@ -2427,7 +2431,8 @@ contact_list_uids_handler (LDAPOp *op,
                                ldap_error,
                                ldap_err2string (ldap_error), ldap_error_msg);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                g_warning ("search returned %d\n", ldap_error);
 
@@ -4298,7 +4303,7 @@ ldap_search_handler (LDAPOp *op,
                /* ignore references */
        } else if (msg_type == LDAP_RES_SEARCH_RESULT) {
                GError *edb_err = NULL;
-               gchar *ldap_error_msg;
+               gchar *ldap_error_msg = NULL;
                gint ldap_error;
 
                g_rec_mutex_lock (&eds_ldap_handler_lock);
@@ -4316,7 +4321,8 @@ ldap_search_handler (LDAPOp *op,
                                ldap_error,
                                ldap_err2string (ldap_error), ldap_error_msg);
                }
-               ldap_memfree (ldap_error_msg);
+               if (ldap_error_msg)
+                       ldap_memfree (ldap_error_msg);
 
                if ((ldap_error == LDAP_TIMELIMIT_EXCEEDED || ldap_error == LDAP_SIZELIMIT_EXCEEDED) && 
can_browse ((EBookBackend *) bl))
                        /* do not complain when search limit exceeded for browseable LDAPs */
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c
index 2f0fbc7..3b235d2 100644
--- a/tests/libebook-contacts/test-phone-number.c
+++ b/tests/libebook-contacts/test-phone-number.c
@@ -43,6 +43,7 @@ static const gchar *match_candidates[] = {
        "+1-857-4663489"
 };
 
+#ifdef ENABLE_PHONENUMBER
 static const EPhoneNumberMatch expected_matches[] = {
        /* not a number */
        E_PHONE_NUMBER_MATCH_NONE,
@@ -124,6 +125,7 @@ static const EPhoneNumberMatch expected_matches[] = {
        E_PHONE_NUMBER_MATCH_NONE,
        E_PHONE_NUMBER_MATCH_EXACT
 };
+#endif /* ENABLE_PHONENUMBER */
 
 typedef struct {
        gchar                           *phone_number;
@@ -500,9 +502,11 @@ main (gint argc,
                "/ebook-phone-number/parse-and-format/auto-region",
                test_parse_auto_region);
 
+       #ifdef ENABLE_PHONENUMBER
        g_assert_cmpint (
                G_N_ELEMENTS (match_candidates) * G_N_ELEMENTS (match_candidates),
                ==, G_N_ELEMENTS (expected_matches));
+       #endif
 
        for (i = 0; i < G_N_ELEMENTS (match_candidates); ++i) {
                for (j = 0; j < G_N_ELEMENTS (match_candidates); ++j) {
diff --git a/tests/libedata-cal/test-cal-cache-intervals.c b/tests/libedata-cal/test-cal-cache-intervals.c
index 7d32622..449bc0c 100644
--- a/tests/libedata-cal/test-cal-cache-intervals.c
+++ b/tests/libedata-cal/test-cal-cache-intervals.c
@@ -209,7 +209,7 @@ test_intervals (TCUFixture *fixture,
 
                intervals = g_slist_prepend (intervals, interval);
 
-               success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_OFFLINE_STATE_SYNCED, 
NULL, &error);
+               success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_CACHE_IS_ONLINE, NULL, 
&error);
                g_assert_no_error (error);
                g_assert (success);
        }
@@ -229,7 +229,7 @@ test_intervals (TCUFixture *fixture,
 
                intervals = g_slist_prepend (intervals, interval);
 
-               success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_OFFLINE_STATE_SYNCED, 
NULL, &error);
+               success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_CACHE_IS_ONLINE, NULL, 
&error);
                g_assert_no_error (error);
                g_assert (success);
        }
@@ -287,7 +287,7 @@ test_intervals (TCUFixture *fixture,
                        id = e_cal_component_get_id (comp);
                        g_assert (id != NULL);
 
-                       success = e_cal_cache_remove_component (fixture->cal_cache, id->uid, id->rid, 
E_OFFLINE_STATE_SYNCED, NULL, &error);
+                       success = e_cal_cache_remove_component (fixture->cal_cache, id->uid, id->rid, 
E_CACHE_IS_ONLINE, NULL, &error);
                        g_assert_no_error (error);
                        g_assert (success);