diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
| commit | 49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch) | |
| tree | 393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/envalloc_merge.c | |
| parent | fdffefb8032922ce7ffe4c00816072a8ff2148fc (diff) | |
| download | skalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz | |
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/envalloc_merge.c')
| -rw-r--r-- | src/libstddjb/envalloc_merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstddjb/envalloc_merge.c b/src/libstddjb/envalloc_merge.c index 9134b84..84179f0 100644 --- a/src/libstddjb/envalloc_merge.c +++ b/src/libstddjb/envalloc_merge.c @@ -1,13 +1,14 @@ /* ISC license. */ +#include <sys/types.h> #include <skalibs/bytestr.h> #include <skalibs/env.h> #include <skalibs/genalloc.h> #include <skalibs/envalloc.h> -int envalloc_merge (genalloc *v, char const *const *envp, unsigned int envlen, char const *modifs, unsigned int modiflen) +int envalloc_merge (genalloc *v, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen) { - unsigned int n = envlen + 1 + byte_count(modifs, modiflen, '\0') ; + size_t n = envlen + 1 + byte_count(modifs, modiflen, '\0') ; if (!genalloc_readyplus(char const *, v, n)) return 0 ; n = env_merge(genalloc_s(char const *, v) + genalloc_len(char const *, v), n, envp, envlen, modifs, modiflen) ; genalloc_setlen(char const *, v, genalloc_len(char const *, v) + n) ; |