Types fix, first pass

4 files changed, 14 insertions, 14 deletions

diff --git a/src/pipe-tools/s6-ftrig-listen.c b/src/pipe-tools/s6-ftrig-listen.c
index 8f0d2cc..112c853 100644
--- a/src/pipe-tools/s6-ftrig-listen.c
+++ b/src/pipe-tools/s6-ftrig-listen.c
@@ -1,5 +1,7 @@
 /* ISC license. */
 
+#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
@@ -69,9 +71,9 @@ int main (int argc, char const **argv, char const *const *envp)
   x[1].fd = ftrigr_fd(&a) ;
 
   {
-    int pid = 0 ;
+    pid_t pid = 0 ;
     unsigned int idlen = argc1 >> 1 ;
-    uint16 ids[idlen] ;
+    uint16_t ids[idlen] ;
     for (; i < idlen ; i++)
     {
       ids[i] = ftrigr_subscribe_g(&a, argv[i<<1], argv[(i<<1)+1], 0, &deadline) ;
diff --git a/src/pipe-tools/s6-ftrig-listen1.c b/src/pipe-tools/s6-ftrig-listen1.c
index ffb43cc..f5f7814 100644
--- a/src/pipe-tools/s6-ftrig-listen1.c
+++ b/src/pipe-tools/s6-ftrig-listen1.c
@@ -1,5 +1,7 @@
 /* ISC license. */
 
+#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
@@ -31,8 +33,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
   iopause_fd x[2] = { { -1, IOPAUSE_READ, 0 }, { -1, IOPAUSE_READ, 0 } } ;
   tain_t deadline, tto ;
   ftrigr_t a = FTRIGR_ZERO ;
-  int pid ;
-  uint16 id ;
+  pid_t pid ;
+  uint16_t id ;
   PROG = "s6-ftrig-listen1" ;
   {
     unsigned int t = 0 ;
diff --git a/src/pipe-tools/s6-ftrig-wait.c b/src/pipe-tools/s6-ftrig-wait.c
index 772ce86..40d458e 100644
--- a/src/pipe-tools/s6-ftrig-wait.c
+++ b/src/pipe-tools/s6-ftrig-wait.c
@@ -1,5 +1,6 @@
 /* ISC license. */
 
+#include <stdint.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/sgetopt.h>
@@ -14,7 +15,7 @@ int main (int argc, char const *const *argv)
 {
   tain_t deadline, tto ;
   ftrigr_t a = FTRIGR_ZERO ;
-  uint16 id ;
+  uint16_t id ;
   char pack[2] = " \n" ;
   PROG = "s6-ftrig-wait" ;
   {
diff --git a/src/pipe-tools/s6-mkfifodir.c b/src/pipe-tools/s6-mkfifodir.c
index 4f5151a..268d822 100644
--- a/src/pipe-tools/s6-mkfifodir.c
+++ b/src/pipe-tools/s6-mkfifodir.c
@@ -1,7 +1,8 @@
 /* ISC license. */
 
+#include <sys/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/uint.h>
+#include <skalibs/gidstuff.h>
 #include <skalibs/strerr2.h>
 #include <s6/ftrigw.h>
 
@@ -10,7 +11,7 @@
 int main (int argc, char const *const *argv)
 {
   subgetopt_t l = SUBGETOPT_ZERO ;
-  int gid = -1 ;
+  gid_t gid = -1 ;
   int force = 0 ;
   PROG = "s6-mkfifodir" ;
   for (;;)
@@ -20,13 +21,7 @@ int main (int argc, char const *const *argv)
     switch (opt)
     {
       case 'f' : force = 1 ; break ;
-      case 'g' :
-      {
-        unsigned int g ;
-        if (!uint0_scan(l.arg, &g)) strerr_dieusage(100, USAGE) ;
-        gid = (int)g ;
-        break ;
-      }
+      case 'g' : if (!gid0_scan(l.arg, &gid)) strerr_dieusage(100, USAGE) ; break ;
       default : strerr_dieusage(100, USAGE) ;
     }
   }