kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move some variable declarations to a more correct place 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12549 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Andrew Thompson 2009-03-10 19:06:19 +00:00
parent 9371d827d8
commit 5602e60cdd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
View File

@ -353,6 +353,11 @@ static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, c
struct erlang_binding *ptr; struct erlang_binding *ptr;
switch_uuid_t uuid; switch_uuid_t uuid;
char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
int type, size;
int i = 0;
void *p = NULL;
char *xmlstr;
ei_x_buff *rep;
ei_x_buff buf; ei_x_buff buf;
ei_x_new_with_version(&buf); ei_x_new_with_version(&buf);
@ -394,10 +399,6 @@ static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, c
ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf); ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf);
switch_mutex_unlock(ptr->listener->sock_mutex); switch_mutex_unlock(ptr->listener->sock_mutex);
int i = 0;
ei_x_buff *rep;
void *p = NULL;
while (!(p = switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str)) || p == &globals.WAITING) { while (!(p = switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str)) || p == &globals.WAITING) {
if (i > 50) { /* half a second timeout */ if (i > 50) { /* half a second timeout */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response\n");
@ -409,14 +410,12 @@ static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, c
} }
rep = (ei_x_buff *) p; rep = (ei_x_buff *) p;
int type, size;
ei_get_type(rep->buff, &rep->index, &type, &size); ei_get_type(rep->buff, &rep->index, &type, &size);
if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */
return NULL; return NULL;
char *xmlstr;
if (!(xmlstr = malloc(size + 1))) { if (!(xmlstr = malloc(size + 1))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n");