Windows updates

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@466 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 4a4a6cdfda70cbd0a957e4a632ef7d091451e4f7..4465be8cf8fde198bfae27cdeeb233d9924adb7a 100644 (file)
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -78,7 +78,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_callback(switch_core_ses
 SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_count(switch_core_session *session,
                                                                                                                          char *buf,
                                                                                                                          unsigned int buflen,
-                                                                                                                         int maxdigits,
+                                                                                                                         unsigned int maxdigits,
                                                                                                                          const char *terminators,
                                                                                                                          char *terminator);
        

diff --git a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
index 32d316ebf209e2efd959934fbca137ea174307af..ede8881b4cbbc4464220f55c20dc42a633b2cfdf 100644 (file)
--- a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
+++ b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="mod_ivrtest"\r
-       ProjectGUID="{78100236-7CEA-4948-96CC-E8ED3160329C}"\r
+       ProjectGUID="{419AA391-5F3F-4BFE-A869-9D154D62A792}"\r
        RootNamespace="mod_ivrtest"\r
        Keyword="Win32Proj"\r
        >\r

diff --git a/src/mod/dialplans/mod_pcre/mod_pcre.c b/src/mod/dialplans/mod_pcre/mod_pcre.c
index 3539559a72580fb9a0a7f56472cabdb3189e4c28..0ab6e89ed6e3b4c976248c68e9f56dad01fa6f36 100644 (file)
--- a/src/mod/dialplans/mod_pcre/mod_pcre.c
+++ b/src/mod/dialplans/mod_pcre/mod_pcre.c
@@ -97,7 +97,7 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
                        match_count = pcre_exec(re,     /* result of pcre_compile() */
                                                                        NULL,   /* we didn't study the pattern */
                                                                        caller_profile->destination_number,     /* the subject string */
-                                                                       strlen(caller_profile->destination_number),     /* the length of the subject string */
+                                                                       (int) strlen(caller_profile->destination_number),       /* the length of the subject string */
                                                                        0,      /* start at offset 0 in the subject */
                                                                        0,      /* default options */
                                                                        ovector,        /* vector of integers for substring information */
@@ -111,7 +111,7 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
                                char newval[1024] = "";
                                char index[10] = "";
                                char replace[128] = "";
-                               int x, y = 0, z = 0, num = 0;
+                               unsigned int x, y = 0, z = 0, num = 0;
                                char *data;
 
                                for (x = 0; x < sizeof(newval) && x < strlen(val);) {
@@ -129,7 +129,7 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
                                                if (pcre_copy_substring
                                                        (caller_profile->destination_number, ovector, match_count, num, replace,
                                                         sizeof(replace)) > 0) {
-                                                       int r;
+                                                       unsigned int r;
                                                        for (r = 0; r < strlen(replace); r++) {
                                                                newval[y++] = replace[r];
                                                        }

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 4bbdfca8f3b14039c85389461081a17bd694f3fe..9073d80a19d59e7faf2b19d2c39ed5ca12224cda 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -75,11 +75,11 @@ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_callback(switch_core_ses
 SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_count(switch_core_session *session,
                                                                                                                          char *buf,
                                                                                                                          unsigned int buflen,
-                                                                                                                         int maxdigits,
+                                                                                                                         unsigned int maxdigits,
                                                                                                                          const char *terminators,
                                                                                                                          char *terminator)
 {
-       int i = 0, x = strlen(buf);
+       unsigned int i = 0, x =  (unsigned int) strlen(buf);
        switch_channel *channel;
        switch_status status = SWITCH_STATUS_SUCCESS;
        
@@ -94,7 +94,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_count(switch_core_sessio
                        char dtmf[128];
                        switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf));
 
-                       for(i =0 ; i < strlen(dtmf); i++) {
+                       for(i =0 ; i < (unsigned int) strlen(dtmf); i++) {
 
                                if (strchr(terminators, dtmf[i])) {
                                        *terminator = dtmf[i];