[svn-commits] twilson: branch twilson/calendaring r160444 - /team/twilson/calendaring/main/

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Dec  2 23:06:02 2008
New Revision: 160444

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160444
Log:
Update to handle rollback to ao2 changes

Modified:
    team/twilson/calendaring/main/calendar.c

Modified: team/twilson/calendaring/main/calendar.c
URL: http://svn.digium.com/view/asterisk/team/twilson/calendaring/main/calendar.c?view=diff&rev=160444&r1=160443&r2=160444
==============================================================================
--- team/twilson/calendaring/main/calendar.c (original)
+++ team/twilson/calendaring/main/calendar.c Tue Dec  2 23:06:02 2008
@@ -87,7 +87,7 @@
 	return ast_str_case_hash(cal->name);
 }
 
-static int calendar_cmp_fn(void *obj, void *arg, void *data, int flags)
+static int calendar_cmp_fn(void *obj, void *arg, int flags)
 {
 	const struct ast_calendar *one = obj, *two = arg;
 	return !strcasecmp(one->name, two->name) ? CMP_MATCH | CMP_STOP: 0;
@@ -98,7 +98,7 @@
 	struct ast_calendar tmp = {
 		.name = name,
 	};
-	return ao2_find(calendars, &tmp, NULL, OBJ_POINTER);
+	return ao2_find(calendars, &tmp, OBJ_POINTER);
 }
 
 static int event_hash_fn(const void *obj, const int flags)
@@ -107,7 +107,7 @@
 	return ast_str_hash(event->uid);
 }
 
-static int event_cmp_fn(void *obj, void *arg, void *data, int flags)
+static int event_cmp_fn(void *obj, void *arg, int flags)
 {
 	const struct ast_calendar_event *one = obj, *two = arg;
 	return !strcmp(one->uid, two->uid) ? CMP_MATCH | CMP_STOP : 0;
@@ -118,7 +118,7 @@
 	struct ast_calendar_event tmp = {
 		.uid = uid,
 	};
-	return ao2_find(events, &tmp, NULL, OBJ_POINTER);
+	return ao2_find(events, &tmp, OBJ_POINTER);
 }
 
 struct ast_calendar_event *ast_calendar_unref_event(struct ast_calendar_event *event)
@@ -541,8 +541,6 @@
 		ao2_unlink(new_events, new_event);
 		new_event = ast_calendar_unref_event(new_event);
 	}
-
-	return 0;
 }
 
 static int load_config(void *data)