[evolution-ews] Store oab_details as guint32 instead of gint.



commit ec8e119ab5e7f18d83ead11ad0ac423ffc0164f4
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Sat Jul 9 10:46:49 2011 +0530

    Store oab_details as guint32 instead of gint.

 src/addressbook/e-book-backend-ews-gal.c |   10 +++++++---
 src/server/e-ews-connection.c            |   16 ++++++++--------
 src/server/e-ews-connection.h            |    8 ++++----
 3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews-gal.c b/src/addressbook/e-book-backend-ews-gal.c
index c2e5e10..467a4cd 100644
--- a/src/addressbook/e-book-backend-ews-gal.c
+++ b/src/addressbook/e-book-backend-ews-gal.c
@@ -52,6 +52,8 @@
 #include "e-ews-connection.h"
 #include "e-ews-item.h"
 
+#define d(x) x
+
 #define EDB_ERROR(_code) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, NULL)
 #define EDB_ERROR_EX(_code,_msg) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg)
 #define EDB_ERROR_FAILED_STATUS(_code, _status) e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_ ## _code, "Failed with status 0x%x", _status)
@@ -189,7 +191,7 @@ static gboolean
 ews_needs_update (EBookBackendEwsGal *cbews, EwsOALDetails *full, GError **error)
 {
 	EBookBackendEwsGalPrivate *priv = cbews->priv;
-	gint seq;
+	guint32 seq;
 	gboolean ret = FALSE;
 	gchar *tmp;
 
@@ -197,7 +199,7 @@ ews_needs_update (EBookBackendEwsGal *cbews, EwsOALDetails *full, GError **error
 	if (error)
 		goto exit;
 
-	seq = atoi (tmp);
+	sscanf (tmp, "%"G_GUINT32_FORMAT, &seq);
 	if (seq < full->seq)
 		ret = TRUE;
 	
@@ -211,6 +213,7 @@ ews_download_full_gal (EBookBackendEwsGal *cbews, EwsOALDetails *full, GCancella
 {
 	EBookBackendEwsGalPrivate *priv = cbews->priv;
 	EEwsConnection *oab_cnc;
+	EwsOabDecoder *eod;
 	gchar *full_url, *oab_url, *cache_file = NULL;
 	const gchar *cache_dir;
 	gchar *comp_cache_file = NULL, *uncompress_file = NULL;
@@ -230,7 +233,8 @@ ews_download_full_gal (EBookBackendEwsGal *cbews, EwsOALDetails *full, GCancella
 	if (!oal_decompress_v4_full_detail_file (comp_cache_file, uncompress_file, error))
 		goto exit;
 
-	g_print ("OAL file decompressed %s \n", uncompress_file);
+	d(g_print ("OAL file decompressed %s \n", uncompress_file);)
+	
 
 exit:	
 	if (comp_cache_file)
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 439a304..f0dfb28 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -1255,15 +1255,15 @@ get_property (xmlNodePtr node_ptr, const gchar *name)
 	return s;
 }
 
-static gint
-get_property_as_int (xmlNodePtr node_ptr, const gchar *name)
+static guint32
+get_property_as_uint32 (xmlNodePtr node_ptr, const gchar *name)
 {
 	gchar *s;
-	gint val = -1;
+	guint32 val = -1;
 	
 	s = get_property (node_ptr, name);
 	if (s)
-		val = atoi (s);
+		sscanf (s,"%"G_GUINT32_FORMAT, &val);
 	g_free (s);
 
 	return val;
@@ -1291,10 +1291,10 @@ parse_oal_full_details (xmlNode *node, const gchar *element)
 		if (node->type == XML_ELEMENT_NODE && !strcmp((char *)node->name, element)) {
 			EwsOALDetails *det = g_new0 (EwsOALDetails, 1);
 
-			det->seq = get_property_as_int (node, "seq");
-			det->ver = get_property_as_int (node, "ver");
-			det->size = get_property_as_int (node, "size");
-			det->uncompressed_size = get_property_as_int (node, "uncompressedsize");
+			det->seq = get_property_as_uint32 (node, "seq");
+			det->ver = get_property_as_uint32 (node, "ver");
+			det->size = get_property_as_uint32 (node, "size");
+			det->uncompressed_size = get_property_as_uint32 (node, "uncompressedsize");
 			det->sha = get_property (node, "uncompressedsize");
 			det->filename = g_strstrip (get_content (node));
 			
diff --git a/src/server/e-ews-connection.h b/src/server/e-ews-connection.h
index 548b641..c42db7c 100644
--- a/src/server/e-ews-connection.h
+++ b/src/server/e-ews-connection.h
@@ -107,10 +107,10 @@ typedef struct {
 } EwsOAL;
 
 typedef struct {
-	gint seq;
-	gint ver;
-	gint size;
-	gint uncompressed_size;
+	guint32 seq;
+	guint32 ver;
+	guint32 size;
+	guint32 uncompressed_size;
 	gchar *sha;
 	gchar *filename;
 } EwsOALDetails;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]