diff options
26 files changed, 18 insertions, 42 deletions
diff --git a/src/conn-tools/s6-ipcserverd.c b/src/conn-tools/s6-ipcserverd.c index 036de7b..abfaeed 100644 --- a/src/conn-tools/s6-ipcserverd.c +++ b/src/conn-tools/s6-ipcserverd.c @@ -1,6 +1,7 @@ /* ISC license. */ #include <sys/types.h> +#include <sys/stat.h> #include <sys/wait.h> #include <errno.h> #include <string.h> diff --git a/src/include/s6/s6lock.h b/src/include/s6/s6lock.h index 90ad05c..8ac0127 100644 --- a/src/include/s6/s6lock.h +++ b/src/include/s6/s6lock.h @@ -4,7 +4,6 @@ #define S6LOCK_H #include <stdint.h> -#include <errno.h> #include <skalibs/tai.h> #include <skalibs/genalloc.h> #include <skalibs/gensetdyn.h> diff --git a/src/libs6/ftrigr_check.c b/src/libs6/ftrigr_check.c index ba0a6f1..0a7fcdc 100644 --- a/src/libs6/ftrigr_check.c +++ b/src/libs6/ftrigr_check.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/gensetdyn.h> #include <s6/ftrigr.h> diff --git a/src/libs6/ftrigr_subscribe.c b/src/libs6/ftrigr_subscribe.c index 97e1931..3766d35 100644 --- a/src/libs6/ftrigr_subscribe.c +++ b/src/libs6/ftrigr_subscribe.c @@ -4,7 +4,8 @@ #include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> +#include <skalibs/uint32.h> #include <skalibs/tai.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> @@ -14,7 +15,7 @@ uint16_t ftrigr_subscribe (ftrigr_t *a, char const *path, char const *re, uint32 { size_t pathlen = strlen(path) ; size_t relen = strlen(re) ; - unsigned int i ; + uint32_t i ; char err ; char tmp[15] = "--L" ; struct iovec v[3] = { { .iov_base = tmp, .iov_len = 15 }, { .iov_base = (char *)path, .iov_len = pathlen + 1 }, { .iov_base = (char *)re, .iov_len = relen + 1 } } ; diff --git a/src/libs6/ftrigr_unsubscribe.c b/src/libs6/ftrigr_unsubscribe.c index 949bc50..4428b72 100644 --- a/src/libs6/ftrigr_unsubscribe.c +++ b/src/libs6/ftrigr_unsubscribe.c @@ -1,9 +1,7 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> -#include <skalibs/types.h> -#include <skalibs/tai.h> +#include <skalibs/uint16.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> #include <s6/ftrigr.h> diff --git a/src/libs6/ftrigr_update.c b/src/libs6/ftrigr_update.c index 7f494c6..52f79b9 100644 --- a/src/libs6/ftrigr_update.c +++ b/src/libs6/ftrigr_update.c @@ -5,7 +5,7 @@ #include <errno.h> #include <skalibs/gccattributes.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/genalloc.h> #include <skalibs/gensetdyn.h> #include <skalibs/unixmessage.h> diff --git a/src/libs6/ftrigr_wait_and.c b/src/libs6/ftrigr_wait_and.c index dc633a9..92080e7 100644 --- a/src/libs6/ftrigr_wait_and.c +++ b/src/libs6/ftrigr_wait_and.c @@ -1,8 +1,6 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> -#include <skalibs/tai.h> #include <skalibs/iopause.h> #include <s6/ftrigr.h> diff --git a/src/libs6/ftrigr_wait_or.c b/src/libs6/ftrigr_wait_or.c index 9d0be0f..0c7ea03 100644 --- a/src/libs6/ftrigr_wait_or.c +++ b/src/libs6/ftrigr_wait_or.c @@ -1,9 +1,7 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/tai.h> #include <skalibs/iopause.h> #include <s6/ftrigr.h> diff --git a/src/libs6/ftrigw_notifyb.c b/src/libs6/ftrigw_notifyb.c index 36871ec..ee5c74c 100644 --- a/src/libs6/ftrigw_notifyb.c +++ b/src/libs6/ftrigw_notifyb.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <sys/types.h> #include <errno.h> #include <signal.h> #include <skalibs/sig.h> diff --git a/src/libs6/s6_accessrules_backend_cdb.c b/src/libs6/s6_accessrules_backend_cdb.c index 64e95d2..6a6551b 100644 --- a/src/libs6/s6_accessrules_backend_cdb.c +++ b/src/libs6/s6_accessrules_backend_cdb.c @@ -2,9 +2,8 @@ #include <string.h> #include <stdint.h> -#include <unistd.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/cdb.h> #include <skalibs/stralloc.h> #include <s6/accessrules.h> diff --git a/src/libs6/s6_accessrules_keycheck_ip4.c b/src/libs6/s6_accessrules_keycheck_ip4.c index 2bd620d..de402be 100644 --- a/src/libs6/s6_accessrules_keycheck_ip4.c +++ b/src/libs6/s6_accessrules_keycheck_ip4.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <sys/types.h> #include <stdint.h> #include <skalibs/types.h> #include <skalibs/fmtscan.h> diff --git a/src/libs6/s6_accessrules_uidgid_cdb.c b/src/libs6/s6_accessrules_uidgid_cdb.c index 3679d87..707086e 100644 --- a/src/libs6/s6_accessrules_uidgid_cdb.c +++ b/src/libs6/s6_accessrules_uidgid_cdb.c @@ -1,7 +1,5 @@ /* ISC license. */ -#include <sys/types.h> -#include <skalibs/cdb.h> #include <s6/accessrules.h> s6_accessrules_result_t s6_accessrules_uidgid_cdb (uid_t uid, gid_t gid, struct cdb *c, s6_accessrules_params_t *params) diff --git a/src/libs6/s6_accessrules_uidgid_fs.c b/src/libs6/s6_accessrules_uidgid_fs.c index 4ed007b..4b7c218 100644 --- a/src/libs6/s6_accessrules_uidgid_fs.c +++ b/src/libs6/s6_accessrules_uidgid_fs.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <sys/types.h> #include <s6/accessrules.h> s6_accessrules_result_t s6_accessrules_uidgid_fs (uid_t uid, gid_t gid, char const *rulesdir, s6_accessrules_params_t *params) diff --git a/src/libs6/s6_fdholder_getdump.c b/src/libs6/s6_fdholder_getdump.c index e201e6e..fb751fa 100644 --- a/src/libs6/s6_fdholder_getdump.c +++ b/src/libs6/s6_fdholder_getdump.c @@ -3,7 +3,7 @@ #include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint32.h> #include <skalibs/allreadwrite.h> #include <skalibs/error.h> #include <skalibs/tai.h> diff --git a/src/libs6/s6_fdholder_list_cb.c b/src/libs6/s6_fdholder_list_cb.c index 9daaff7..f192167 100644 --- a/src/libs6/s6_fdholder_list_cb.c +++ b/src/libs6/s6_fdholder_list_cb.c @@ -2,7 +2,7 @@ #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint32.h> #include <skalibs/bytestr.h> #include <skalibs/error.h> #include <skalibs/stralloc.h> diff --git a/src/libs6/s6_fdholder_setdump.c b/src/libs6/s6_fdholder_setdump.c index 1548409..e5b694d 100644 --- a/src/libs6/s6_fdholder_setdump.c +++ b/src/libs6/s6_fdholder_setdump.c @@ -4,7 +4,7 @@ #include <stdint.h> #include <string.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint32.h> #include <skalibs/allreadwrite.h> #include <skalibs/bytestr.h> #include <skalibs/error.h> diff --git a/src/libs6/s6_svc_write.c b/src/libs6/s6_svc_write.c index b7d2a27..ebd8ab0 100644 --- a/src/libs6/s6_svc_write.c +++ b/src/libs6/s6_svc_write.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <sys/types.h> #include <errno.h> #include <skalibs/allreadwrite.h> #include <skalibs/djbunix.h> diff --git a/src/libs6/s6_svstatus_pack.c b/src/libs6/s6_svstatus_pack.c index f6e6e92..fbce109 100644 --- a/src/libs6/s6_svstatus_pack.c +++ b/src/libs6/s6_svstatus_pack.c @@ -1,8 +1,8 @@ /* ISC license. */ #include <stdint.h> +#include <skalibs/uint16.h> #include <skalibs/uint64.h> -#include <skalibs/types.h> #include <skalibs/tai.h> #include <s6/s6-supervise.h> diff --git a/src/libs6/s6_svstatus_unpack.c b/src/libs6/s6_svstatus_unpack.c index dcd923a..dc358d3 100644 --- a/src/libs6/s6_svstatus_unpack.c +++ b/src/libs6/s6_svstatus_unpack.c @@ -1,8 +1,8 @@ /* ISC license. */ #include <stdint.h> +#include <skalibs/uint16.h> #include <skalibs/uint64.h> -#include <skalibs/types.h> #include <skalibs/tai.h> #include <s6/s6-supervise.h> diff --git a/src/libs6/s6lock_acquire.c b/src/libs6/s6lock_acquire.c index d9b4170..b9791bf 100644 --- a/src/libs6/s6lock_acquire.c +++ b/src/libs6/s6lock_acquire.c @@ -4,7 +4,8 @@ #include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> +#include <skalibs/uint32.h> #include <skalibs/tai.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> @@ -16,7 +17,7 @@ int s6lock_acquire (s6lock_t *a, uint16_t *u, char const *path, uint32_t options char err ; char tmp[23] = "--<" ; struct iovec v[2] = { { .iov_base = tmp, .iov_len = 23 }, { .iov_base = (char *)path, .iov_len = pathlen + 1 } } ; - unsigned int i ; + uint32_t i ; if (pathlen > UINT32_MAX) return (errno = ENAMETOOLONG, 0) ; if (!gensetdyn_new(&a->data, &i)) return 0 ; if (i > UINT16_MAX) diff --git a/src/libs6/s6lock_check.c b/src/libs6/s6lock_check.c index 8bdbae0..da08eff 100644 --- a/src/libs6/s6lock_check.c +++ b/src/libs6/s6lock_check.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/error.h> #include <skalibs/gensetdyn.h> diff --git a/src/libs6/s6lock_release.c b/src/libs6/s6lock_release.c index 5be66e2..caf91a3 100644 --- a/src/libs6/s6lock_release.c +++ b/src/libs6/s6lock_release.c @@ -1,10 +1,8 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> -#include <skalibs/tai.h> +#include <skalibs/uint16.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> #include <s6/s6lock.h> diff --git a/src/libs6/s6lock_update.c b/src/libs6/s6lock_update.c index 128f9cc..a56c276 100644 --- a/src/libs6/s6lock_update.c +++ b/src/libs6/s6lock_update.c @@ -3,7 +3,7 @@ #include <stdint.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/genalloc.h> #include <skalibs/gensetdyn.h> #include <skalibs/unixmessage.h> diff --git a/src/libs6/s6lock_wait_and.c b/src/libs6/s6lock_wait_and.c index 22ec63b..d5d3792 100644 --- a/src/libs6/s6lock_wait_and.c +++ b/src/libs6/s6lock_wait_and.c @@ -1,8 +1,6 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> -#include <skalibs/tai.h> #include <skalibs/iopause.h> #include <s6/s6lock.h> diff --git a/src/libs6/s6lock_wait_or.c b/src/libs6/s6lock_wait_or.c index f098339..f73b5ab 100644 --- a/src/libs6/s6lock_wait_or.c +++ b/src/libs6/s6lock_wait_or.c @@ -1,10 +1,8 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> -#include <skalibs/tai.h> -#include <skalibs/iopause.h> #include <skalibs/error.h> +#include <skalibs/iopause.h> #include <s6/s6lock.h> int s6lock_wait_or (s6lock_t *a, uint16_t const *idlist, unsigned int n, tain_t const *deadline, tain_t *stamp) diff --git a/src/supervision/s6_svlisten_loop.c b/src/supervision/s6_svlisten_loop.c index 5f60be6..3cab3ff 100644 --- a/src/supervision/s6_svlisten_loop.c +++ b/src/supervision/s6_svlisten_loop.c @@ -1,13 +1,8 @@ /* ISC license. */ #include <string.h> -#include <stdint.h> -#include <unistd.h> -#include <errno.h> -#include <skalibs/types.h> #include <skalibs/bytestr.h> #include <skalibs/bitarray.h> -#include <skalibs/tai.h> #include <skalibs/strerr2.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> |