kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify the ast_dynamic_str_*.... routines by

Browse Source 
renaming them to ast_str ... and putting the
struct ast_threadstorage pointer into the struct ast_str.

This makes the code a lot more readable.

At this point we can use these routines also to
replace ast_build_string().



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-12-15 23:10:42 +00:00
parent 961754d4b1
commit 055abfe9d9
5 changed files with 95 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/manager.c
View File

@@ -769,13 +769,13 @@ static int send_string(struct mansession *s, char *string)
void astman_append(struct mansession *s, const char *fmt, ...)
{
va_list ap;
struct ast_dynamic_str *buf;
struct ast_str *buf;
if (!(buf = ast_dynamic_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE)))
if (!(buf = ast_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE)))
return;
va_start(ap, fmt);
ast_dynamic_str_thread_set_va(&buf, 0, &astman_append_buf, fmt, ap);
ast_str_set_va(&buf, 0, fmt, ap);
va_end(ap);
if (s->f != NULL)
@@ -2277,39 +2277,39 @@ int __manager_event(int category, const char *event,
char tmp[4096] = "";
va_list ap;
struct timeval now;
struct ast_dynamic_str *buf;
struct ast_str *buf;
/* Abort if there aren't any manager sessions */
if (!num_sessions)
return 0;
if (!(buf = ast_dynamic_str_thread_get(&manager_event_buf, MANAGER_EVENT_BUF_INITSIZE)))
if (!(buf = ast_str_thread_get(&manager_event_buf, MANAGER_EVENT_BUF_INITSIZE)))
return -1;
ast_dynamic_str_thread_set(&buf, 0, &manager_event_buf,
ast_str_set(&buf, 0,
"Event: %s\r\nPrivilege: %s\r\n",
event, authority_to_str(category, auth, sizeof(auth)));
if (timestampevents) {
now = ast_tvnow();
ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf,
ast_str_append(&buf, 0,
"Timestamp: %ld.%06lu\r\n",
now.tv_sec, (unsigned long) now.tv_usec);
}
if (manager_debug) {
static int seq;
ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf,
ast_str_append(&buf, 0,
"SequenceNumber: %d\r\n",
ast_atomic_fetchadd_int(&seq, 1));
ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf,
ast_str_append(&buf, 0,
"File: %s\r\nLine: %d\r\nFunc: %s\r\n", file, line, func);
}
va_start(ap, fmt);
ast_dynamic_str_thread_append_va(&buf, 0, &manager_event_buf, fmt, ap);
ast_str_append_va(&buf, 0, fmt, ap);
va_end(ap);
ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf, "\r\n");
ast_str_append(&buf, 0, "\r\n");
append_event(buf->str, category);