Author: mikej Date: Sat Nov 10 07:25:54 2007 New Revision: 6218 Modified: freeswitch/trunk/src/include/switch_regex.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_regex.c Log: fix windows build. Modified: freeswitch/trunk/src/include/switch_regex.h ============================================================================== --- freeswitch/trunk/src/include/switch_regex.h (original) +++ freeswitch/trunk/src/include/switch_regex.h Sat Nov 10 07:25:54 2007 @@ -51,7 +51,7 @@ 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 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Sat Nov 10 07:25:54 2007 @@ -471,10 +471,10 @@ 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")) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Nov 10 07:25:54 2007 @@ -1421,11 +1421,11 @@ 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'; } Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Sat Nov 10 07:25:54 2007 @@ -98,11 +98,12 @@ 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 @@ 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]; }