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

fix windows build. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6218 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-11-10 12:25:54 +00:00
parent fe80390877
commit 3f4fd53c97
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_regex.h
View File

@ -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(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

2
src/mod/applications/mod_limit/mod_limit.c
View File

@ -471,10 +471,10 @@ SWITCH_STANDARD_API(group_api_function)
goto done;
} else if (!strcasecmp(argv[0], "call")) {
char buf[4096] = "";
char *how = ",";
callback_t cbt = { 0 };
cbt.buf = buf;
cbt.len = sizeof(buf);
char *how = ",";
if (argc > 2) {
if (!strcasecmp(argv[2], "order")) {

4
src/switch_channel.c
View File

@ -1421,11 +1421,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
if (offset >= 0) {
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);
}
if (ooffset > 0 && ooffset < strlen(sub_val)) {
if (ooffset > 0 && (size_t)ooffset < strlen(sub_val)) {
if ((p = (char *)sub_val + ooffset)) {
*p = '\0';
}

7
src/switch_regex.c
View File

@ -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,
char *substituted, uint32_t len, int *ovector)
char *substituted, switch_size_t len, int *ovector)
{
char index[10] = "";
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);) {
if (data[x] == '$') {
@ -122,7 +123,7 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c
num = atoi(index);
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++) {
substituted[y++] = replace[r];
}