提交 3f4fd53c authored 作者: Michael Jerris's avatar Michael Jerris

fix windows build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6218 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 fe803908
...@@ -51,7 +51,7 @@ SWITCH_DECLARE(void) switch_regex_free(void *data); ...@@ -51,7 +51,7 @@ SWITCH_DECLARE(void) switch_regex_free(void *data);
SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen);
SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data,
char *substituted, uint32_t len, int *ovector); char *substituted, switch_size_t len, int *ovector);
/*! /*!
\brief Function to evaluate an expression against a string \brief Function to evaluate an expression against a string
......
...@@ -471,10 +471,10 @@ SWITCH_STANDARD_API(group_api_function) ...@@ -471,10 +471,10 @@ SWITCH_STANDARD_API(group_api_function)
goto done; goto done;
} else if (!strcasecmp(argv[0], "call")) { } else if (!strcasecmp(argv[0], "call")) {
char buf[4096] = ""; char buf[4096] = "";
char *how = ",";
callback_t cbt = { 0 }; callback_t cbt = { 0 };
cbt.buf = buf; cbt.buf = buf;
cbt.len = sizeof(buf); cbt.len = sizeof(buf);
char *how = ",";
if (argc > 2) { if (argc > 2) {
if (!strcasecmp(argv[2], "order")) { if (!strcasecmp(argv[2], "order")) {
......
...@@ -1421,11 +1421,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel ...@@ -1421,11 +1421,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
if (offset >= 0) { if (offset >= 0) {
sub_val += offset; sub_val += offset;
} else if (abs(offset) <= strlen(sub_val)) { } else if ((size_t)abs(offset) <= strlen(sub_val)) {
sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset); sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset);
} }
if (ooffset > 0 && ooffset < strlen(sub_val)) { if (ooffset > 0 && (size_t)ooffset < strlen(sub_val)) {
if ((p = (char *)sub_val + ooffset)) { if ((p = (char *)sub_val + ooffset)) {
*p = '\0'; *p = '\0';
} }
......
...@@ -98,11 +98,12 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi ...@@ -98,11 +98,12 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data,
char *substituted, uint32_t len, int *ovector) char *substituted, switch_size_t len, int *ovector)
{ {
char index[10] = ""; char index[10] = "";
char replace[1024] = ""; char replace[1024] = "";
uint32_t x, y = 0, z = 0, num = 0; switch_size_t x, y = 0, z = 0;
int num = 0;
for (x = 0; x < (len - 1) && x < strlen(data);) { for (x = 0; x < (len - 1) && x < strlen(data);) {
if (data[x] == '$') { if (data[x] == '$') {
...@@ -122,7 +123,7 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c ...@@ -122,7 +123,7 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c
num = atoi(index); num = atoi(index);
if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) { if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) {
unsigned int r; switch_size_t r;
for (r = 0; r < strlen(replace); r++) { for (r = 0; r < strlen(replace); r++) {
substituted[y++] = replace[r]; substituted[y++] = replace[r];
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论