diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-11-04 18:47:20 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-11-04 18:47:20 +0000 |
commit | 2cc8e25222dedf98d5e73816156d9c174d8db93f (patch) | |
tree | df27b5cee1f68180fcf72f85f287bb8ddccdecd6 /apps | |
parent | a57a3cbf1964acde1fbf588d952b3fa59f197226 (diff) |
Slightly optimize ast_devstate_str and rename global functions devstate2str and config_text_file_save to have an ast_ prefix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_page.c | 4 | ||||
-rw-r--r-- | apps/app_queue.c | 6 | ||||
-rw-r--r-- | apps/app_voicemail.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/app_page.c b/apps/app_page.c index 89559b119..ddebbf0ac 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -178,9 +178,9 @@ static int page_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, PAGE_SKIP)) { state = ast_device_state(tech); if (state == AST_DEVICE_UNKNOWN) { - ast_log(LOG_WARNING, "Destination '%s' has device state '%s'. Paging anyway.\n", tech, devstate2str(state)); + ast_log(LOG_WARNING, "Destination '%s' has device state '%s'. Paging anyway.\n", tech, ast_devstate2str(state)); } else if (state != AST_DEVICE_NOT_INUSE) { - ast_log(LOG_WARNING, "Destination '%s' has device state '%s'.\n", tech, devstate2str(state)); + ast_log(LOG_WARNING, "Destination '%s' has device state '%s'.\n", tech, ast_devstate2str(state)); continue; } } diff --git a/apps/app_queue.c b/apps/app_queue.c index 81e822355..eef55f55b 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1007,9 +1007,9 @@ static int handle_statechange(void *datap) } if (found) - ast_debug(1, "Device '%s' changed to state '%d' (%s)\n", sc->dev, sc->state, devstate2str(sc->state)); + ast_debug(1, "Device '%s' changed to state '%d' (%s)\n", sc->dev, sc->state, ast_devstate2str(sc->state)); else - ast_debug(3, "Device '%s' changed to state '%d' (%s) but we don't care because they're not a member of any queue.\n", sc->dev, sc->state, devstate2str(sc->state)); + ast_debug(3, "Device '%s' changed to state '%d' (%s) but we don't care because they're not a member of any queue.\n", sc->dev, sc->state, ast_devstate2str(sc->state)); ast_free(sc); return 0; @@ -5692,7 +5692,7 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv) mem->dynamic ? " (dynamic)" : "", mem->realtime ? " (realtime)" : "", mem->paused ? " (paused)" : "", - devstate2str(mem->status)); + ast_devstate2str(mem->status)); if (mem->calls) ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)", mem->calls, (long) (time(NULL) - mem->lastcall)); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 3338de8ab..f888f3e67 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1177,7 +1177,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword) /* save the results */ reset_user_pw(vmu->context, vmu->mailbox, newpassword); ast_copy_string(vmu->password, newpassword, sizeof(vmu->password)); - config_text_file_save(VOICEMAIL_CONFIG, cfg, "AppVoicemail"); + ast_config_text_file_save(VOICEMAIL_CONFIG, cfg, "AppVoicemail"); } category = NULL; var = NULL; @@ -1207,7 +1207,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword) /* save the results and clean things up */ reset_user_pw(vmu->context, vmu->mailbox, newpassword); ast_copy_string(vmu->password, newpassword, sizeof(vmu->password)); - config_text_file_save("users.conf", cfg, "AppVoicemail"); + ast_config_text_file_save("users.conf", cfg, "AppVoicemail"); } } @@ -5928,7 +5928,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, msg_cat = ast_category_get(msg_cfg, "message"); snprintf(duration_buf, 11, "%ld", *duration); if (!ast_variable_update(msg_cat, "duration", duration_buf, NULL, 0)) { - config_text_file_save(textfile, msg_cfg, "app_voicemail"); + ast_config_text_file_save(textfile, msg_cfg, "app_voicemail"); } } |