Re: [Opensync-devel] Preparing for OpenSync API 0.40 soft-freeze

[Chris F. <cd...@fo...>]

On Thu, Sep 17, 2009 at 02:57:11AM +0200, Daniel Gollub wrote:
> Hi,
> 
> could you all double-check the public interfaces of the OpenSync trunk API, if 
> they fit your needs for you application/plugin ... (those which got exported 
> by the OSYNC_EXPORT macro)

Hi Daniel,

I figured I'd give the Barry 0.3x/0.4x plugin a test compile, but I got
stuck before I got there trying to compile the vformat plugin.

The OSyncError** changes to the time API don't seem to have trickled through,
and now, if I understand correctly, there's a lot of opportunity for leaks.

For example, this partial patch shows that there is **error cleanup needed
even inside error handling if() blocks...

Is this the planned way to fix this, or am I missing something?

Thanks,
- Chris



diff --git a/src/xmlformat-recurrence.c b/src/xmlformat-recurrence.c
index f8fffd5..87edf3b 100644
--- a/src/xmlformat-recurrence.c
+++ b/src/xmlformat-recurrence.c
@@ -115,6 +115,7 @@ static void convert_vcal_rrule_countuntil(OSyncXMLField *xmlfield, const char *d
 	int count;
 	int offset = 0; 
 	char *until = NULL;
+	OSyncError *error = NULL;
 
 	/* COUNT: #20 */
 	if (sscanf(duration_block, "#%d", &count) == 1) {
@@ -132,12 +133,13 @@ static void convert_vcal_rrule_countuntil(OSyncXMLField *xmlfield, const char *d
 		 */
 
 		if (!osync_time_isutc(duration_block)) {
-			struct tm *ttm = osync_time_vtime2tm(duration_block);
-			offset = osync_time_timezone_diff(ttm);
+			struct tm *ttm = osync_time_vtime2tm(duration_block, &error);
+			offset = osync_time_timezone_diff(ttm, &error);
+
 			g_free(ttm);
 		}
 
-		until = osync_time_vtime2utc(duration_block, offset);
+		until = osync_time_vtime2utc(duration_block, offset, &error);
 	} else {
 		until = g_strdup(duration_block);
 	}
@@ -145,6 +147,11 @@ static void convert_vcal_rrule_countuntil(OSyncXMLField *xmlfield, const char *d
 	FIXME_xmlfield_set_key_value(xmlfield, "Until", until);
 
 	g_free(until);
+
+	if( error != NULL ) {
+		osync_trace(TRACE_ERROR, "%s: %s" , __func__, osync_error_print(&error));
+		osync_error_unref(&error);
+	}
 }
 
 OSyncXMLField *convert_vcal_rrule_to_xml(OSyncXMLFormat *xmlformat, VFormatAttribute *attr, const char *rulename, OSyncError **error)
@@ -305,6 +312,7 @@ static char *convert_rrule_vcal_until(const char *until_utc)
 {
 	int offset = 0; 
 	char *until = NULL;
+	OSyncError *error = NULL;
 
 
 	/* UNTIL: 20070515T120000 */
@@ -313,10 +321,15 @@ static char *convert_rrule_vcal_until(const char *until_utc)
 	 * in the same Timezone as the host.
 	 */
 
-	struct tm *ttm = osync_time_vtime2tm(until_utc);
-	offset = osync_time_timezone_diff(ttm);
+	struct tm *ttm = osync_time_vtime2tm(until_utc, &error);
+	offset = osync_time_timezone_diff(ttm, &error);
 	g_free(ttm);
-	until = osync_time_vtime2localtime(until_utc, offset);
+	until = osync_time_vtime2localtime(until_utc, offset, &error);
+
+	if( error != NULL ) {
+		osync_trace(TRACE_ERROR, "%s: %s" , __func__, osync_error_print(&error));
+		osync_error_unref(&error);
+	}
 
 	return until;
 
diff --git a/src/xmlformat-vcalendar.c b/src/xmlformat-vcalendar.c
index 46320b7..76ab132 100644
--- a/src/xmlformat-vcalendar.c
+++ b/src/xmlformat-vcalendar.c
@@ -268,6 +268,7 @@ VFormatAttribute *handle_xml_vcal_alarm_attribute(VFormat *vevent, OSyncXMLField
 
 	const char *action = osync_xmlfield_get_key_value(xmlfield, "AlarmAction");
 	const char *trigger = osync_xmlfield_get_key_value(xmlfield, "AlarmTrigger");
+	OSyncError *error = NULL;
 
 	// trigger and action are required
 	if (trigger && action) {
@@ -318,15 +319,15 @@ VFormatAttribute *handle_xml_vcal_alarm_attribute(VFormat *vevent, OSyncXMLField
 		}
 		
 		duration = osync_time_alarmdu2sec(trigger);	
-		dtstarted = osync_time_vtime2unix(dtstart, 0);
+		dtstarted = osync_time_vtime2unix(dtstart, 0, &error);
 
 		dtstarted += duration;
-		runtime = osync_time_unix2vtime(&dtstarted);
+		runtime = osync_time_unix2vtime(&dtstarted, &error);
 
 		if (!osync_time_isutc(dtstart)) {
 			osync_trace(TRACE_INTERNAL, "WARNNING: timestamp is not UTC - converting reminder to localtime");
 			char *utc_runtime = runtime;
-			runtime = osync_time_vtime2localtime(utc_runtime, 0);
+			runtime = osync_time_vtime2localtime(utc_runtime, 0, &error);
 			g_free(utc_runtime);
 		}
 
@@ -347,6 +348,14 @@ VFormatAttribute *handle_xml_vcal_alarm_attribute(VFormat *vevent, OSyncXMLField
 
 	vformat_add_attribute(vevent, attr);
 
+	/* Check for any time-related error before returning */
+	if( error != NULL ) {
+		osync_trace(TRACE_INTERNAL, "Error (time-related function failed): %s",
+			osync_error_print(&error));
+		osync_error_unref(&error);
+		return NULL;
+	}
+
 	return attr;
 }
 /* END: xml -> vcalendar10 only attributes */