summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-01-08 22:37:23 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-01-08 22:37:23 +0000
commitc0bfd8814f6cd8e45a230deca0f28954ed38480e (patch)
tree3fe2e7692806402346cae9509b22d790e5a6b39d /src/include
parentda010cd4a3a4da1b03940b76b138e75cc36106cf (diff)
downloads6-rc-c0bfd8814f6cd8e45a230deca0f28954ed38480e.tar.xz
Types fix: first pass
Diffstat (limited to 'src/include')
-rw-r--r--src/include/s6-rc/s6rc-db.h22
-rw-r--r--src/include/s6-rc/s6rc-utils.h3
2 files changed, 13 insertions, 12 deletions
diff --git a/src/include/s6-rc/s6rc-db.h b/src/include/s6-rc/s6rc-db.h
index 0053af9..60287e9 100644
--- a/src/include/s6-rc/s6rc-db.h
+++ b/src/include/s6-rc/s6rc-db.h
@@ -3,7 +3,7 @@
#ifndef S6RC_DB_H
#define S6RC_DB_H
-#include <skalibs/uint32.h>
+#include <stdint.h>
#include <skalibs/diuint32.h>
#include <skalibs/buffer.h>
@@ -16,14 +16,14 @@
typedef struct s6rc_oneshot_s s6rc_oneshot_t, *s6rc_oneshot_t_ref ;
struct s6rc_oneshot_s
{
- uint32 argc[2] ;
- uint32 argv[2] ;
+ uint32_t argc[2] ;
+ uint32_t argv[2] ;
} ;
typedef struct s6rc_longrun_s s6rc_longrun_t, *s6rc_longrun_t_ref ;
struct s6rc_longrun_s
{
- uint32 pipeline[2] ;
+ uint32_t pipeline[2] ;
} ;
typedef union s6rc_longshot_u s6rc_longshot_t, *s6rc_longshot_t_ref ;
@@ -36,11 +36,11 @@ union s6rc_longshot_u
typedef struct s6rc_service_s s6rc_service_t, *s6rc_service_t_ref ;
struct s6rc_service_s
{
- uint32 name ;
- uint32 flags ;
- uint32 deps[2] ;
- uint32 ndeps[2] ;
- uint32 timeout[2] ;
+ uint32_t name ;
+ uint32_t flags ;
+ uint32_t deps[2] ;
+ uint32_t ndeps[2] ;
+ uint32_t timeout[2] ;
s6rc_longshot_t x ;
} ;
@@ -55,10 +55,10 @@ struct s6rc_db_s
unsigned int ndeps ;
char *string ;
char const **argvs ;
- uint32 *deps ;
+ uint32_t *deps ;
} ;
-extern int s6rc_db_read_uint32 (buffer *, uint32 *) ;
+extern int s6rc_db_read_uint32 (buffer *, uint32_t *) ;
extern int s6rc_db_read_sizes (int, s6rc_db_t *) ;
extern int s6rc_db_read (int, s6rc_db_t *) ;
diff --git a/src/include/s6-rc/s6rc-utils.h b/src/include/s6-rc/s6rc-utils.h
index e7a6d0c..4eb65f5 100644
--- a/src/include/s6-rc/s6rc-utils.h
+++ b/src/include/s6-rc/s6rc-utils.h
@@ -3,12 +3,13 @@
#ifndef S6RC_UTILS_H
#define S6RC_UTILS_H
+#include <sys/types.h>
#include <skalibs/stralloc.h>
#include <s6-rc/s6rc-db.h>
extern void s6rc_graph_closure (s6rc_db_t const *, unsigned char *, unsigned int, int) ;
extern int s6rc_lock (char const *, int, int *, char const *, int, int *) ;
extern int s6rc_read_uint (char const *, unsigned int *) ;
-extern int s6rc_sanitize_dir (stralloc *, char const *, unsigned int *) ;
+extern int s6rc_sanitize_dir (stralloc *, char const *, size_t *) ;
#endif