diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 20:55:40 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 20:55:40 +0000 |
| commit | 88e10708c5ba8158ee4fdf1aa08585739125b5da (patch) | |
| tree | d08154c0eafb287f12d6b28ce99eea6938c21ce8 /apps/app_directory.c | |
| parent | 2149521341f36fb9f90d61796969f2665daca309 (diff) | |
This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, uniquely named. There's probably more, but I can't remember it right now.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81361 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 896f9cbe1..05460c409 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -386,7 +386,7 @@ static struct ast_config *realtime_directory(char *context) /* Does the context exist within the config file? If not, make one */ cat = ast_category_get(cfg, context); if (!cat) { - cat = ast_category_new(context); + cat = ast_category_new(context, "", 99999); if (!cat) { ast_log(LOG_WARNING, "Out of memory\n"); ast_config_destroy(cfg); @@ -402,7 +402,7 @@ static struct ast_config *realtime_directory(char *context) snprintf(tmp, sizeof(tmp), "no-password,%s,hidefromdir=%s", fullname ? fullname : "", hidefromdir ? hidefromdir : "no"); - var = ast_variable_new(mailbox, tmp); + var = ast_variable_new(mailbox, tmp, ""); if (var) ast_variable_append(cat, var); else |