diff options
| author | Sean Bright <sean@malleable.com> | 2008-11-25 01:01:49 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-11-25 01:01:49 +0000 |
| commit | fd8caa1778e486b26badd4691ad50447c1f08631 (patch) | |
| tree | 6af2cfc1b0ec46aa179c5019f00274f1eba84fce /main/config.c | |
| parent | 69d85eaca9e8636c2af2dd9bd29e61d027d55c2c (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: https://origsvn.digium.com/svn/asterisk/trunk@158959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c index 216958065..4cef91a55 100644 --- a/main/config.c +++ b/main/config.c @@ -149,7 +149,7 @@ static int hash_string(const void *obj, const int flags) return total; } -static int hashtab_compare_strings(void *a, void *b, void *data, int flags) +static int hashtab_compare_strings(void *a, void *b, int flags) { const struct inclfile *ae = a, *be = b; return !strcmp(ae->fname, be->fname) ? CMP_MATCH | CMP_STOP : 0; @@ -1517,7 +1517,7 @@ static void set_fn(char *fn, int fn_size, const char *file, const char *configfi else snprintf(fn, fn_size, "%s/%s", ast_config_AST_CONFIG_DIR, file); lookup.fname = fn; - *fi = ao2_find(fileset, &lookup, NULL, OBJ_POINTER); + *fi = ao2_find(fileset, &lookup, OBJ_POINTER); if (!(*fi)) { /* set up a file scratch pad */ struct inclfile *fx = ao2_alloc(sizeof(struct inclfile), inclfile_destroy); |