GNOME.org
 

[evolution-exchange] Fix compiler warnings.

commit 4f3c91444200d78b0a0c5c04eb048517e5bd3053
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon May 25 01:01:22 2009 -0400

    Fix compiler warnings.
---
 addressbook/e-book-backend-exchange.c |   39 +++++++++++++++--------------
 addressbook/e-book-backend-gal.c      |   43 +++++++++++++++++----------------
 calendar/e2k-cal-query.c              |    4 +-
 camel/camel-exchange-journal.c        |    5 ++-
 camel/camel-exchange-provider.c       |    4 +-
 mail/mail-stub-exchange.c             |    5 ++-
 storage/exchange-migrate.c            |    7 +++--
 storage/migr-test.c                   |    4 +-
 8 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index d060784..1ff6d9a 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -147,8 +147,8 @@ http_status_to_pas (E2kHTTPStatus status)
 
 struct PropMapping {
 	EContactField field;
-	char *prop_name;
-	char *e_book_field;
+	const char *prop_name;
+	const char *e_book_field;
 	int flags;
 #define FLAG_UNLIKEABLE 0x001  /* can't use LIKE with it */
 #define FLAG_COMPOSITE  0x002  /* read-only fields that can be written
@@ -232,7 +232,7 @@ struct ContactListMember
 };
 
 static const char *
-e_book_backend_exchange_prop_to_exchange (char *propname)
+e_book_backend_exchange_prop_to_exchange (const char *propname)
 {
 	int i;
 
@@ -249,7 +249,7 @@ get_email_field_from_props (ExchangeAccount *account,
 			    EContact *contact, char *data)
 {
 	char *emailtype;
-	char *typeselector;
+	const char *typeselector;
 
 	/* here's where we do the super involved
 	   conversion from local email addresses to
@@ -1043,7 +1043,7 @@ enum addressprop {
 	ADDRPROP_LAST
 };
 
-static char *homeaddrpropnames[] = {
+static const char *homeaddrpropnames[] = {
 	E2K_PR_CONTACTS_HOME_PO_BOX,
 	E2K_PR_CONTACTS_HOME_STREET,
 	E2K_PR_CONTACTS_HOME_CITY,
@@ -1052,7 +1052,7 @@ static char *homeaddrpropnames[] = {
 	E2K_PR_CONTACTS_HOME_COUNTRY,
 };
 
-static char *otheraddrpropnames[] = {
+static const char *otheraddrpropnames[] = {
 	E2K_PR_CONTACTS_OTHER_PO_BOX,
 	E2K_PR_CONTACTS_OTHER_STREET,
 	E2K_PR_CONTACTS_OTHER_CITY,
@@ -1061,7 +1061,7 @@ static char *otheraddrpropnames[] = {
 	E2K_PR_CONTACTS_OTHER_COUNTRY,
 };
 
-static char *workaddrpropnames[] = {
+static const char *workaddrpropnames[] = {
 	E2K_PR_CONTACTS_WORK_PO_BOX,
 	E2K_PR_CONTACTS_WORK_STREET,
 	E2K_PR_CONTACTS_WORK_CITY,
@@ -1077,7 +1077,8 @@ proppatch_address (PropMapping *prop_mapping,
 {
 	EContactAddress *new_address, *cur_address = NULL;
 	char *new_addrprops[ADDRPROP_LAST], *cur_addrprops[ADDRPROP_LAST];
-	char **propnames, *value;
+	const char **propnames;
+	char *value;
 	int i;
 
 	new_address = e_contact_get (new_contact, prop_mapping->field);
@@ -2074,7 +2075,7 @@ func_match (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
 }
 
 static struct {
-	char *name;
+	const char *name;
 	ESExpFunc *func;
 	guint flags;
 } symbols[] = {
@@ -2099,7 +2100,7 @@ e_book_backend_exchange_build_restriction (const char *query,
 	sexp = e_sexp_new ();
 
 	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		e_sexp_add_function (sexp, 0, symbols[i].name,
+		e_sexp_add_function (sexp, 0, (char *) symbols[i].name,
 				     symbols[i].func,
 				     GUINT_TO_POINTER (symbols[i].flags));
 	}
@@ -2948,16 +2949,16 @@ e_book_backend_exchange_class_init (EBookBackendExchangeClass *klass)
 
 	/* Static initialization */
 	field_names_array = g_ptr_array_new ();
-	g_ptr_array_add (field_names_array, E2K_PR_DAV_CONTENT_CLASS);
-	g_ptr_array_add (field_names_array, E2K_PR_DAV_UID);
-	g_ptr_array_add (field_names_array, E2K_PR_DAV_LAST_MODIFIED);
-	g_ptr_array_add (field_names_array, E2K_PR_DAV_CREATION_DATE);
-	g_ptr_array_add (field_names_array, E2K_PR_MAPI_EMAIL_1_ADDRTYPE);
-	g_ptr_array_add (field_names_array, E2K_PR_MAPI_EMAIL_2_ADDRTYPE);
-	g_ptr_array_add (field_names_array, E2K_PR_MAPI_EMAIL_3_ADDRTYPE);
-	g_ptr_array_add (field_names_array, E2K_PR_HTTPMAIL_HAS_ATTACHMENT);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_DAV_CONTENT_CLASS);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_DAV_UID);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_DAV_LAST_MODIFIED);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_DAV_CREATION_DATE);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_MAPI_EMAIL_1_ADDRTYPE);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_MAPI_EMAIL_2_ADDRTYPE);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_MAPI_EMAIL_3_ADDRTYPE);
+	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_HTTPMAIL_HAS_ATTACHMENT);
 	for (i = 0; i < num_prop_mappings; i ++)
-		g_ptr_array_add (field_names_array, prop_mappings[i].prop_name);
+		g_ptr_array_add (field_names_array, (gpointer) prop_mappings[i].prop_name);
 	field_names = (const char **)field_names_array->pdata;
 	n_field_names = field_names_array->len;
 
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 790bb4a..939b16f 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -73,7 +73,7 @@
 
 #define TV_TO_MILLIS(timeval) ((timeval).tv_sec * 1000 + (timeval).tv_usec / 1000)
 
-static gchar *query_prop_to_ldap(gchar *query_prop);
+static gchar *query_prop_to_ldap (const gchar *query_prop);
 static int build_query (EBookBackendGAL *bl, const char *query, const char *ldap_filter, char **ldap_query);
 
 #define PARENT_TYPE E_TYPE_BOOK_BACKEND
@@ -151,7 +151,7 @@ static void last_mod_time_populate (EContact *contact, char **values, EBookBacke
 
 struct prop_info {
 	EContactField field_id;
-	char *ldap_attr;
+	const char *ldap_attr;
 #define PROP_TYPE_STRING   0x01
 #define PROP_TYPE_COMPLEX  0x02
 #define PROP_TYPE_GROUP    0x04
@@ -1002,7 +1002,7 @@ func_not(ESExp *f, int argc, ESExpResult **argv, void *data)
 }
 
 static gchar *
-query_prop_to_ldap(gchar *query_prop)
+query_prop_to_ldap (const gchar *query_prop)
 {
 	int i;
 
@@ -1077,7 +1077,8 @@ static ESExpResult *
 func_is_or_begins_with(ESExp *f, int argc, ESExpResult **argv, gboolean exact)
 {
 	ESExpResult *r;
-	char *propname, *str, *ldap_attr, *star, *filter;
+	const char *star;
+	char *propname, *str, *ldap_attr, *filter;
 
 	if (argc != 2
 	    || argv[0]->type != ESEXP_RES_STRING
@@ -1170,7 +1171,7 @@ func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data
 
 /* 'builtin' functions */
 static struct {
-	char *name;
+	const char *name;
 	ESExpFunc *func;
 } symbols[] = {
 	{ "and", func_and },
@@ -1192,7 +1193,7 @@ build_query (EBookBackendGAL *bl, const char *query, const char *ldap_filter, ch
 	sexp = e_sexp_new();
 
 	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		e_sexp_add_function(sexp, 0, symbols[i].name,
+		e_sexp_add_function(sexp, 0, (char *) symbols[i].name,
 				    symbols[i].func, NULL);
 	}
 
@@ -1472,8 +1473,8 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
 							if (!subldap) {
 								subldap = e2k_global_catalog_get_ldap (bl->priv->gc, NULL, NULL);
 							}
-							grpattrs[0] = "cn";
-							grpattrs[1] = "mail";
+							grpattrs[0] = (char *) "cn";
+							grpattrs[1] = (char *) "mail";
 							grpattrs[2] = NULL;
 							/*search for member attributes*/
 							/*get the e-mail id for each member and add them to the list*/
@@ -2106,12 +2107,12 @@ parse_page_control(
 #if ENABLE_CACHE
 static int dosearch(
 	EBookBackendGAL *bl,
-	char	*base,
-	int		scope,
-	char	*filtpatt,
-	char	*value,
-	char	**attrs,
-	int		attrsonly,
+	const char *base,
+	int scope,
+	char *filtpatt,
+	char *value,
+	char **attrs,
+	int attrsonly,
 	LDAPControl **sctrls,
 	LDAPControl **cctrls,
 	struct timeval *timeout,
@@ -2211,7 +2212,6 @@ generate_cache (EBookBackendGAL *book_backend_gal, const char * changed_filter)
 	gchar *ldap_query;
 	int  i = 0, rc ;
 	BerElement *prber = NULL;
-	time_t t1;
 	char t[15], *cachetime;
 	LDAPControl c[6];
 
@@ -2269,9 +2269,9 @@ getNextPage:
 	if ( (pageSize !=0 ) && (morePagedResults != 0)) {
 		d(printf ("Start next iteration\n"));
 		goto getNextPage;
-	}
-	else
+	} else {
 		d(printf ("All the entries fetched and finished building the cache\n"));
+	}
 
 	/* Set the cache to populated and thaw the changes */
 
@@ -2279,7 +2279,7 @@ getNextPage:
 	if (priv->cache_time != priv->last_best_time)
 		priv->last_best_time++;
 	g_sprintf (t," %d", (int)priv->last_best_time);
-	printf("All done, cached time set to %d, %s(%d)\n", priv->last_best_time, ctime (&priv->last_best_time), priv->cache_time);
+	printf("All done, cached time set to %d, %s(%d)\n", (gint) priv->last_best_time, ctime (&priv->last_best_time), (gint) priv->cache_time);
 	e_book_backend_db_cache_set_time (priv->file_db, t);
 	priv->is_summary_ready = TRUE;
 	book_backend_gal->priv->file_db->sync (book_backend_gal->priv->file_db, 0);
@@ -2294,6 +2294,7 @@ update_cache (EBookBackendGAL *gal)
 	time_t t1;
 	char *t = e_book_backend_db_cache_get_time (gal->priv->file_db);
 	char *filter, *galtime;
+	struct tm *tm;
 
 	printf("Cache is populated, Refresh now... \n");
 	if (t && *t)
@@ -2303,13 +2304,13 @@ update_cache (EBookBackendGAL *gal)
 	if (t1 == 0)
 		return generate_cache (gal, NULL);
 	gal->priv->last_best_time = t1;
-	struct tm *tm = localtime (&t1);
+	tm = localtime (&t1);
 	galtime = g_strdup_printf("%04d%02d%02d%02d%02d%02d.0Z",tm->tm_year+1900, tm->tm_mon+1,tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	filter = g_strdup_printf ("|(whenCreated>=%s)(whenChanged>=%s)", galtime, galtime);
 
 	g_free(galtime);
-	printf("Filter %s: Time %d\n", filter, t1);
+	printf("Filter %s: Time %d\n", filter, (gint) t1);
 	/* Download New contacts */
 	generate_cache (gal, filter);
 
@@ -2875,7 +2876,7 @@ class_init (EBookBackendGALClass *klass)
 		supported_fields = g_list_append (supported_fields,
 						  (char *)e_contact_field_name (prop_info[i].field_id));
 	}
-	supported_fields = g_list_append (supported_fields, "file_as");
+	supported_fields = g_list_append (supported_fields, (gpointer) "file_as");
 
 	search_attrs = g_new (char *, num_prop_infos + 1);
 	for (i = 0; i < num_prop_infos; i++)
diff --git a/calendar/e2k-cal-query.c b/calendar/e2k-cal-query.c
index 38e1d3e..9dddf6a 100644
--- a/calendar/e2k-cal-query.c
+++ b/calendar/e2k-cal-query.c
@@ -362,7 +362,7 @@ func_completed_before (ESExp *esexp, int argc, ESExpResult **argv, void *user_da
 }
 
 static struct {
-	char *name;
+	const char *name;
 	ESExpFunc *func;
 } functions[] = {
 	{ "and", func_and },
@@ -399,7 +399,7 @@ e2k_cal_query_to_restriction (ECalBackendExchange *cbex,
 
 	esexp = e_sexp_new ();
 	for (i = 0; i < (sizeof (functions) / sizeof (functions[0])); i++)
-		e_sexp_add_function (esexp, 0, functions[i].name, functions[i].func, NULL);
+		e_sexp_add_function (esexp, 0, (char *) functions[i].name, functions[i].func, NULL);
 
 	e_sexp_input_text (esexp, sexp, strlen (sexp));
 	if (e_sexp_parse (esexp) == -1) {
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index f5d5fbf..f55f180 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -180,6 +180,7 @@ static int
 exchange_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out)
 {
 	CamelExchangeJournalEntry *exchange_entry = (CamelExchangeJournalEntry *) entry;
+	const char *string;
 	char *tmp;
 
 	if (camel_file_util_encode_uint32 (out, exchange_entry->type) == -1)
@@ -197,8 +198,8 @@ exchange_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE
 			return -1;
 		if (camel_file_util_encode_string (out, exchange_entry->folder_name))
 			return -1;
-		tmp = exchange_entry->delete_original ? "True" : "False";
-		if (camel_file_util_encode_string (out, tmp))
+		string = exchange_entry->delete_original ? "True" : "False";
+		if (camel_file_util_encode_string (out, string))
 			return -1;
 		break;
 	case CAMEL_EXCHANGE_JOURNAL_ENTRY_DELETE:
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index 6303624..2853750 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -177,8 +177,8 @@ camel_provider_module_init (void)
 
 	bindtextdomain (GETTEXT_PACKAGE, CONNECTOR_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	exchange_provider.translation_domain = GETTEXT_PACKAGE;
-	exchange_provider.translation_domain = GETTEXT_PACKAGE;
+	exchange_provider.translation_domain = (gchar *) GETTEXT_PACKAGE;
+	exchange_provider.translation_domain = (gchar *) GETTEXT_PACKAGE;
 
 	/* 'auth_types' is not used anywhere else, it's there just for localization of the 'al_auth' */
 	for (i = 0; auth_types [i]; i++) {
diff --git a/mail/mail-stub-exchange.c b/mail/mail-stub-exchange.c
index 7a24e15..ffff55f 100644
--- a/mail/mail-stub-exchange.c
+++ b/mail/mail-stub-exchange.c
@@ -2648,7 +2648,7 @@ transfer_messages (MailStub *stub, const char *source_name,
 
 		g_hash_table_insert (order, mmsg, GINT_TO_POINTER (i));
 		g_ptr_array_add (hrefs, strrchr (mmsg->href, '/') + 1);
-		g_ptr_array_add (new_uids, "");
+		g_ptr_array_add (new_uids, (gpointer) "");
 	}
 
 	if (delete_originals && hrefs->len > 1) {
@@ -2798,8 +2798,9 @@ get_folder_info_data (MailStub *stub, const char *top, guint32 store_flags,
 			hier = exchange_account_get_hierarchy_by_type (mse->account, EXCHANGE_HIERARCHY_PUBLIC);
 			if (hier)
 				exchange_hierarchy_scan_subtree (hier, hier->toplevel, mode);
-		} else
+		} else {
 			d(g_print ("%s(%d):%s: NOT SUBSCRIBED - open_folder returned = [%d]\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, result));
+		}
 	}
 
 	/* No need to check for recursive flag, as I will always be returning a tree, instead of a single folder info object */
diff --git a/storage/exchange-migrate.c b/storage/exchange-migrate.c
index ef13b2c..7e51f70 100644
--- a/storage/exchange-migrate.c
+++ b/storage/exchange-migrate.c
@@ -110,7 +110,7 @@ show_error_dialog()
 					       GTK_DIALOG_DESTROY_WITH_PARENT,
 					       GTK_MESSAGE_ERROR,
 					       GTK_BUTTONS_OK,
-					       err_string);
+					       "%s", err_string);
 	gtk_dialog_run (GTK_DIALOG (error_dialog));
 	gtk_widget_destroy (error_dialog);
 
@@ -288,7 +288,7 @@ cp_r (char *src, const char *dest)
 }
 
 static gchar *
-form_dir_path (char *file_name, char *delim)
+form_dir_path (char *file_name, const char *delim)
 {
 	GString *path = g_string_new (NULL);
 	gchar *dir_path;
@@ -309,7 +309,8 @@ static gchar*
 get_contacts_dir_from_filename(const char *migr_file)
 {
 	char *file_to_be_migrated = g_strdup (migr_file);
-	char *dot, *delim = "_", *file_name;
+	char *dot, *file_name;
+	const char *delim = "_";
 	gchar *dir_path = NULL;
 
 	dot = strchr (file_to_be_migrated, '.');
diff --git a/storage/migr-test.c b/storage/migr-test.c
index 8e33250..26b8725 100644
--- a/storage/migr-test.c
+++ b/storage/migr-test.c
@@ -43,8 +43,8 @@ main (int argc, char **argv)
 	CORBA_short major=1;
 	CORBA_short minor=4;
 	CORBA_short revision=0;
-	gchar *source = "~/evolution";
-	gchar *dest= "/tmp/.evolution-test";
+	const gchar *source = "~/evolution";
+	const gchar *dest= "/tmp/.evolution-test";
 	gchar *user = NULL, *server = NULL, *base_dir, *uid = NULL;
 	int opt;
 	char optstr[] = "M:m:r:u:h:s:d:";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]