[asterisk-commits] twilson: branch twilson/calendaring r156950 - in /team/twilson/calendaring: m...

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Nov 14 12:10:00 2008
New Revision: 156950

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156950
Log:
Fix reviewboard issues pointed to my mmichelson

Modified:
    team/twilson/calendaring/main/calendar.c
    team/twilson/calendaring/res/res_caldav.c
    team/twilson/calendaring/res/res_icalendar.c

Modified: team/twilson/calendaring/main/calendar.c
URL: http://svn.digium.com/view/asterisk/team/twilson/calendaring/main/calendar.c?view=diff&rev=156950&r1=156949&r2=156950
==============================================================================
--- team/twilson/calendaring/main/calendar.c (original)
+++ team/twilson/calendaring/main/calendar.c Fri Nov 14 12:10:00 2008
@@ -84,7 +84,7 @@
 static int calendar_hash_fn(const void *obj, const int flags)
 {
 	const struct ast_calendar *cal = obj;
-	return ast_str_hash(cal->name);
+	return ast_str_case_hash(cal->name);
 }
 
 static int calendar_cmp_fn(void *obj, void *arg, void *data, int flags)
@@ -110,7 +110,7 @@
 static int event_cmp_fn(void *obj, void *arg, void *data, int flags)
 {
 	const struct ast_calendar_event *one = obj, *two = arg;
-	return !strcasecmp(one->uid, two->uid) ? CMP_MATCH : 0;
+	return !strcmp(one->uid, two->uid) ? CMP_MATCH : 0;
 }
 
 static struct ast_calendar_event *find_event(struct ao2_container *events, const char *uid)

Modified: team/twilson/calendaring/res/res_caldav.c
URL: http://svn.digium.com/view/asterisk/team/twilson/calendaring/res/res_caldav.c?view=diff&rev=156950&r1=156949&r2=156950
==============================================================================
--- team/twilson/calendaring/res/res_caldav.c (original)
+++ team/twilson/calendaring/res/res_caldav.c Fri Nov 14 12:10:00 2008
@@ -331,6 +331,7 @@
 
 	if (ast_string_field_init(event, 32)) {
 		ast_log(LOG_ERROR, "Could not allocate string fields for event!\n");
+		event = ast_calendar_unref_event(event);
 		return;
 	}
 

Modified: team/twilson/calendaring/res/res_icalendar.c
URL: http://svn.digium.com/view/asterisk/team/twilson/calendaring/res/res_icalendar.c?view=diff&rev=156950&r1=156949&r2=156950
==============================================================================
--- team/twilson/calendaring/res/res_icalendar.c (original)
+++ team/twilson/calendaring/res/res_icalendar.c Fri Nov 14 12:10:00 2008
@@ -76,6 +76,7 @@
 		icalcomponent_free(pvt->data);
 	}
 	ast_string_field_free_memory(pvt);
+	i = ao2_iterator_init(pvt->events, 0);
 	while ((event = ao2_iterator_next(&i))) {
 		ao2_unlink(pvt->events, event);
 		event = ast_calendar_unref_event(event);
@@ -174,6 +175,7 @@
 
 	if (ast_string_field_init(event, 32)) {
 		ast_log(LOG_ERROR, "Could not allocate string fields for event!\n");
+		event = ast_calendar_unref_event(event);
 		return;
 	}