aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSangchul Lee <sangchul1011@gmail.com>2019-03-18 16:47:55 +0900
committerSangchul Lee <sangchul1011@gmail.com>2019-03-19 11:42:19 +0900
commiteec27ec686d20d189853d5cee3eac54eb8cb9a3e (patch)
tree10c0ec9da67482dc2352173599aeb03dfc30b497
parentc235acd7879e8fb37b042197114666fb9698ccae (diff)
downloadpulseaudio-eec27ec686d20d189853d5cee3eac54eb8cb9a3e.tar.gz
core-util: Use size_t for out parameter of pa_split_*in_place()
pa_split_in_place() and pa_split_spaces_in_place() are modifed to use size_t type instead of integer type. alsa-ucm.c is revised according to this change. Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
-rw-r--r--src/modules/alsa/alsa-ucm.c2
-rw-r--r--src/pulsecore/core-util.c6
-rw-r--r--src/pulsecore/core-util.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index d2d3ee1e..341c8012 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -801,7 +801,7 @@ static int ucm_port_contains(const char *port_name, const char *dev_name, bool i
int ret = 0;
const char *r;
const char *state = NULL;
- int len;
+ size_t len;
if (!port_name || !dev_name)
return false;
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 83782bdc..51a9d276 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -924,7 +924,7 @@ char *pa_split(const char *c, const char *delimiter, const char**state) {
* as-is without the length parameter, since it is merely pointing to a point
* within the original string. The variable state points to, should be
* initialized to NULL before the first call. */
-const char *pa_split_in_place(const char *c, const char *delimiter, int *n, const char**state) {
+const char *pa_split_in_place(const char *c, const char *delimiter, size_t *n, const char**state) {
const char *current = *state ? *state : c;
size_t l;
@@ -960,7 +960,7 @@ char *pa_split_spaces(const char *c, const char **state) {
/* Similar to pa_split_spaces, except this returns a string in-place.
Returned string is generally not NULL-terminated.
See pa_split_in_place(). */
-const char *pa_split_spaces_in_place(const char *c, int *n, const char **state) {
+const char *pa_split_spaces_in_place(const char *c, size_t *n, const char **state) {
const char *current = *state ? *state : c;
size_t l;
@@ -2859,7 +2859,7 @@ bool pa_str_in_list(const char *haystack, const char *delimiters, const char *ne
/* Checks a whitespace-separated list of words in haystack for needle */
bool pa_str_in_list_spaces(const char *haystack, const char *needle) {
const char *s;
- int n;
+ size_t n;
const char *state = NULL;
if (!haystack || !needle)
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 32579739..cfb9eb22 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -109,9 +109,9 @@ static inline const char *pa_strna(const char *x) {
}
char *pa_split(const char *c, const char *delimiters, const char **state);
-const char *pa_split_in_place(const char *c, const char *delimiters, int *n, const char **state);
+const char *pa_split_in_place(const char *c, const char *delimiters, size_t *n, const char **state);
char *pa_split_spaces(const char *c, const char **state);
-const char *pa_split_spaces_in_place(const char *c, int *n, const char **state);
+const char *pa_split_spaces_in_place(const char *c, size_t *n, const char **state);
char *pa_strip_nl(char *s);
char *pa_strip(char *s);