diff options
author | Richard Mudgett <rmudgett@digium.com> | 2011-07-31 00:19:11 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2011-07-31 00:19:11 +0000 |
commit | 6cf345e0236d3dca3331f4ee024cda5b437273fe (patch) | |
tree | 3a64b7f2f039854a639db4f90a990a344d49c0f1 | |
parent | a5be6a0f85ee2b28029c024b4a327367822b1982 (diff) |
Fixed compiler warning and a couple prototype mismatches.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/astobj2.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 45d12a46d..7a8bc621b 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -770,16 +770,15 @@ static void *internal_ao2_callback(struct ao2_container *c, } } -void *__ao2_callback_debug(struct ao2_container *c, - const enum search_flags flags, - ao2_callback_fn *cb_fn, void *arg, - char *tag, char *file, int line, const char *funcname) +void *__ao2_callback_debug(struct ao2_container *c, enum search_flags flags, + ao2_callback_fn *cb_fn, void *arg, char *tag, char *file, int line, + const char *funcname) { return internal_ao2_callback(c,flags, cb_fn, arg, NULL, DEFAULT, tag, file, line, funcname); } -void *__ao2_callback(struct ao2_container *c, const enum search_flags flags, - ao2_callback_fn *cb_fn, void *arg) +void *__ao2_callback(struct ao2_container *c, enum search_flags flags, + ao2_callback_fn *cb_fn, void *arg) { return internal_ao2_callback(c,flags, cb_fn, arg, NULL, DEFAULT, NULL, NULL, 0, NULL); } @@ -803,12 +802,16 @@ void *__ao2_callback_data(struct ao2_container *c, const enum search_flags flags */ void *__ao2_find_debug(struct ao2_container *c, const void *arg, enum search_flags flags, char *tag, char *file, int line, const char *funcname) { - return __ao2_callback_debug(c, flags, c->cmp_fn, (void *) arg, tag, file, line, funcname); + void *arged = (void *) arg;/* Done to avoid compiler const warning */ + + return __ao2_callback_debug(c, flags, c->cmp_fn, arged, tag, file, line, funcname); } void *__ao2_find(struct ao2_container *c, const void *arg, enum search_flags flags) { - return __ao2_callback(c, flags, c->cmp_fn, (void *) arg); + void *arged = (void *) arg;/* Done to avoid compiler const warning */ + + return __ao2_callback(c, flags, c->cmp_fn, arged); } /*! |