From 7cc21a90bdb748ddf02525b56b0b2c9dbdfd98a3 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 17 Jan 2008 05:52:50 +0000 Subject: [PATCH] use unsigned more consistently git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7261 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_utils.h | 2 +- src/switch_utils.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index fcacd85f96..88899aa8d4 100644 --- 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 caefa2eadb..04dbc0ccd1 100644 --- 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;