diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
commit | 2207b9a515214bf72785eabf75bd587bd7df23e8 (patch) | |
tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /apps/app_festival.c | |
parent | c7f2030d7977ded782c6430a33e57bbbb69cd6df (diff) |
Merge config updates (bug #3406)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_festival.c')
-rwxr-xr-x | apps/app_festival.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_festival.c b/apps/app_festival.c index 13eaa26b2..91a23c1fa 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -282,7 +282,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) char *intstr; struct ast_config *cfg; - cfg = ast_load(FESTIVAL_CONFIG); + cfg = ast_config_load(FESTIVAL_CONFIG); if (!cfg) { ast_log(LOG_WARNING, "No such configuration file %s\n", FESTIVAL_CONFIG); return -1; @@ -308,7 +308,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) } if (!vdata || ast_strlen_zero(vdata)) { ast_log(LOG_WARNING, "festival requires an argument (text)\n"); - ast_destroy(cfg); + ast_config_destroy(cfg); return -1; } strncpy(data, vdata, sizeof(data) - 1); @@ -326,7 +326,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) if (fd < 0) { ast_log(LOG_WARNING,"festival_client: can't get socket\n"); - ast_destroy(cfg); + ast_config_destroy(cfg); return -1; } memset(&serv_addr, 0, sizeof(serv_addr)); @@ -335,7 +335,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) serverhost = ast_gethostbyname(host, &ahp); if (serverhost == (struct hostent *)0) { ast_log(LOG_WARNING,"festival_client: gethostbyname failed\n"); - ast_destroy(cfg); + ast_config_destroy(cfg); return -1; } memmove(&serv_addr.sin_addr,serverhost->h_addr, serverhost->h_length); @@ -345,7 +345,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) { ast_log(LOG_WARNING,"festival_client: connect to server failed\n"); - ast_destroy(cfg); + ast_config_destroy(cfg); return -1; } @@ -448,7 +448,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) } } while (strcmp(ack,"OK\n") != 0); close(fd); - ast_destroy(cfg); + ast_config_destroy(cfg); LOCAL_USER_REMOVE(u); return res; |