diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-18 16:44:44 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-18 17:03:35 +0200 |
| commit | d577888d8f73e62866dfa70d4dd14b35373e4e7d (patch) | |
| tree | 5fa6425814200597091c221938d031bbe9abf2d9 /src/systemd/src/basic/strv.h | |
| parent | 5e8c12eecefb18cd335e24d46a38f66210e6b8e9 (diff) | |
| parent | ac170893e915bf64178553e2073c98794fc745b3 (diff) | |
| download | NetworkManager-d577888d8f73e62866dfa70d4dd14b35373e4e7d.tar.gz | |
systemd: merge branch systemd into master
Diffstat (limited to 'src/systemd/src/basic/strv.h')
| -rw-r--r-- | src/systemd/src/basic/strv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/systemd/src/basic/strv.h b/src/systemd/src/basic/strv.h index 79512c0ce3..958c5f3a98 100644 --- a/src/systemd/src/basic/strv.h +++ b/src/systemd/src/basic/strv.h @@ -32,7 +32,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free_erase); void strv_clear(char **l); char **strv_copy(char * const *l); -unsigned strv_length(char * const *l) _pure_; +size_t strv_length(char * const *l) _pure_; int strv_extend_strv(char ***a, char **b, bool filter_duplicates); int strv_extend_strv_concat(char ***a, char **b, const char *suffix); @@ -41,7 +41,7 @@ int strv_extendf(char ***l, const char *format, ...) _printf_(2,0); int strv_extend_front(char ***l, const char *value); int strv_push(char ***l, char *value); int strv_push_pair(char ***l, char *a, char *b); -int strv_insert(char ***l, unsigned position, char *value); +int strv_insert(char ***l, size_t position, char *value); static inline int strv_push_prepend(char ***l, char *value) { return strv_insert(l, 0, value); @@ -113,7 +113,7 @@ void strv_print(char **l); if (!first) \ _l = (char**) &first; \ else { \ - unsigned _n; \ + size_t _n; \ va_list _ap; \ \ _n = 1; \ |