diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
| commit | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_directory.c | |
| parent | 1013afa1ad09d854207d24d3aed691321fecc100 (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index f85dbeb11..59a82a238 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -484,23 +484,23 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc if (ucfg) { for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) { - const char *pos; + const char *position; if (!strcasecmp(cat, "general")) continue; if (!ast_true(ast_config_option(ucfg, cat, "hasdirectory"))) continue; /* Find all candidate extensions */ - pos = ast_variable_retrieve(ucfg, cat, "fullname"); - if (!pos) + position = ast_variable_retrieve(ucfg, cat, "fullname"); + if (!position) continue; res = 0; if (ast_test_flag(&flags, OPT_LISTBYLASTNAME)) { - res = check_match(&item, pos, cat, ext, 0 /* use_first_name */); + res = check_match(&item, position, cat, ext, 0 /* use_first_name */); } if (!res && ast_test_flag(&flags, OPT_LISTBYFIRSTNAME)) { - res = check_match(&item, pos, cat, ext, 1 /* use_first_name */); + res = check_match(&item, position, cat, ext, 1 /* use_first_name */); } if (!res) |