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/include/skalibs/env.h | |
| 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/include/skalibs/env.h')
| -rw-r--r-- | src/include/skalibs/env.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/skalibs/env.h b/src/include/skalibs/env.h index ccb3aac..f0c2dbc 100644 --- a/src/include/skalibs/env.h +++ b/src/include/skalibs/env.h @@ -3,23 +3,24 @@ #ifndef ENV_H #define ENV_H +#include <sys/types.h> #include <skalibs/gccattributes.h> #include <skalibs/stralloc.h> -extern unsigned int env_len (char const *const *) gccattr_pure ; +extern size_t env_len (char const *const *) gccattr_pure ; extern char const *env_get (char const *) gccattr_pure ; extern char const *env_get2 (char const *const *, char const *) gccattr_pure ; extern char const *ucspi_get (char const *) gccattr_pure ; extern int env_addmodif (stralloc *, char const *, char const *) ; -extern int env_make (char const **, unsigned int, char const *, unsigned int) ; -extern unsigned int env_merge (char const **, unsigned int, char const *const *, unsigned int, char const *, unsigned int) ; -extern int env_string (stralloc *, char const *const *, unsigned int) ; +extern int env_make (char const **, size_t, char const *, size_t) ; +extern size_t env_merge (char const **, size_t, char const *const *, size_t, char const *, size_t) ; +extern int env_string (stralloc *, char const *const *, size_t) ; #define SKALIBS_ENVDIR_VERBATIM 0x01 #define SKALIBS_ENVDIR_NOCHOMP 0x02 extern int envdir_internal (char const *, stralloc *, unsigned int, char) ; #define envdir(path, sa) envdir_internal(path, (sa), 0, '\n') -#define envdir_leaveblanks(path, sa) envdir_internal(path, (sa), SKALIBS_ENVDIR_NOCHOMP, '\n') +#define envdir_chomp(path, sa) envdir_internal(path, (sa), SKALIBS_ENVDIR_NOCHOMP, '\n') #define envdir_verbatim_chomp(path, sa) envdir_internal(path, (sa), SKALIBS_ENVDIR_VERBATIM, '\n') #define envdir_verbatim(path, sa) envdir_internal(path, (sa), SKALIBS_ENVDIR_VERBATIM|SKALIBS_ENVDIR_NOCHOMP, '\n') |