diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 01:01:49 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 01:01:49 +0000 |
commit | 3ce5f8f4ee27228b26f6d39d9e1cf75f439995a7 (patch) | |
tree | 6af2cfc1b0ec46aa179c5019f00274f1eba84fce /main/features.c | |
parent | 7bf3c44abe26f6ce1dc917c33e5ed4a98e80776d (diff) |
This is basically a complete rollback of r155401, as it was determined that
it would be best to maintain API compatibility. Instead, this commit introduces
ao2_callback_data() which is functionally identical to ao2_callback() except
that it allows you to pass arbitrary data to the callback.
Reviewed by Mark Michelson via ReviewBoard:
http://reviewboard.digium.com/r/64
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@158959 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
-rw-r--r-- | main/features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 7fd76a62f..561b2a57e 100644 --- a/main/features.c +++ b/main/features.c @@ -296,7 +296,7 @@ static int parkinglot_hash_cb(const void *obj, const int flags) return ast_str_case_hash(parkinglot->name); } -static int parkinglot_cmp_cb(void *obj, void *arg, void *data, int flags) +static int parkinglot_cmp_cb(void *obj, void *arg, int flags) { struct ast_parkinglot *parkinglot = obj, *parkinglot2 = arg; @@ -2855,7 +2855,7 @@ struct ast_parkinglot *find_parkinglot(const char *name) ast_copy_string(tmp_parkinglot.name, name, sizeof(tmp_parkinglot.name)); - parkinglot = ao2_find(parkinglots, &tmp_parkinglot, NULL, OBJ_POINTER); + parkinglot = ao2_find(parkinglots, &tmp_parkinglot, OBJ_POINTER); if (parkinglot && option_debug) ast_log(LOG_DEBUG, "Found Parkinglot: %s\n", parkinglot->name); |