use unsigned more consistently

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

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index fcacd85f96fc0828dcd5cd29dba3875a43da8217..88899aa8d46f0fafa393b8e1d51c0ffb2758a46f 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -304,7 +304,7 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in);
   \param arraylen the max number of elements in the array
   \return the number of elements added to the array
 */
-SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen);
+SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, unsigned int arraylen);
 
 SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str);
 SWITCH_DECLARE(char *) switch_strip_spaces(const char *str);

diff --git a/src/switch_utils.c b/src/switch_utils.c
index caefa2eadb5d08622f6a96c5ab4470968aa5851c..04dbc0ccd16c1732110c9e7a7ed8f560cfdf4f5c 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -1072,7 +1072,7 @@ static char *cleanup_separated_string(char *str)
 }
 
 /* Separate a string using a delimiter that is not a space */
-static unsigned int separate_string_char_delim(char *buf, char delim, char **array, int arraylen)
+static unsigned int separate_string_char_delim(char *buf, char delim, char **array, unsigned int arraylen)
 {
        enum tokenizer_state {
                START,
@@ -1082,7 +1082,7 @@ static unsigned int separate_string_char_delim(char *buf, char delim, char **arr
        unsigned int count = 0;
        char *ptr = buf;
        int  inside_quotes = 0;
-       int i;
+       unsigned int i;
        
        while (*ptr && count < arraylen) {
                switch (state) {
@@ -1113,7 +1113,7 @@ static unsigned int separate_string_char_delim(char *buf, char delim, char **arr
 }
 
 /* Separate a string using a delimiter that is a space */
-static unsigned int separate_string_blank_delim(char *buf, char **array, int arraylen)
+static unsigned int separate_string_blank_delim(char *buf, char **array, unsigned int arraylen)
 {
        enum tokenizer_state {
                START,
@@ -1125,7 +1125,7 @@ static unsigned int separate_string_blank_delim(char *buf, char **array, int arr
        unsigned int count = 0;
        char *ptr = buf;
        int  inside_quotes = 0;
-       int i;
+       unsigned int i;
 
        while (*ptr && count < arraylen) {
                switch (state) {
@@ -1170,7 +1170,7 @@ static unsigned int separate_string_blank_delim(char *buf, char **array, int arr
        return count;
 }
 
-SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen)
+SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, unsigned int arraylen)
 {
        if (!buf || !array || !arraylen) {
                return 0;