diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-23 16:07:31 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-23 16:07:31 +0000 |
| commit | e62d3ae45e9bf3b97551b8879bf6c441ff961ec1 (patch) | |
| tree | 239987a77426dac08b2877b8e0afab5d4aae6eff /src/include | |
| parent | 2c922d2f9870ef174894a6b91399d5cd59318352 (diff) | |
| download | s6-e62d3ae45e9bf3b97551b8879bf6c441ff961ec1.tar.xz | |
- add s6_accessrules_params_free
- some libfdholder debug
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/s6/accessrules.h | 2 | ||||
| -rw-r--r-- | src/include/s6/s6-fdholder.h | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/include/s6/accessrules.h b/src/include/s6/accessrules.h index 3edf8b6..e294817 100644 --- a/src/include/s6/accessrules.h +++ b/src/include/s6/accessrules.h @@ -15,6 +15,8 @@ struct s6_accessrules_params_s } ; #define S6_ACCESSRULES_PARAMS_ZERO { .env = STRALLOC_ZERO, .exec = STRALLOC_ZERO } +extern void s6_accessrules_params_free (s6_accessrules_params_t *) ; + typedef enum s6_accessrules_result_e s6_accessrules_result_t, *s6_accessrules_result_t_ref ; enum s6_accessrules_result_e { diff --git a/src/include/s6/s6-fdholder.h b/src/include/s6/s6-fdholder.h index 7907607..d15b869 100644 --- a/src/include/s6/s6-fdholder.h +++ b/src/include/s6/s6-fdholder.h @@ -17,9 +17,9 @@ struct s6_fdholder_s { unixconnection_t connection ; } ; -#define S6_FDHOLDER_ZERO { .connection = UNIXMESSAGE_CONNECTION_ZERO } ; +#define S6_FDHOLDER_ZERO { .connection = UNIXCONNECTION_ZERO } ; -#define s6_fdholder_init(a, fdin, fdout) unixconnection_init(&(a)->connection, fdin, fdout) +#define s6_fdholder_init(a, fd) unixconnection_init(&(a)->connection, fd, fd) #define s6_fdholder_free(a) unixconnection_free(&(a)->connection) @@ -43,11 +43,11 @@ struct s6_fdholder_retrieve_result_s extern int s6_fdholder_retrieve_maybe_delete_async (s6_fdholder_t *, char const *, int) ; extern unixmessage_handler_func_t s6_fdholder_retrieve_cb ; extern int s6_fdholder_retrieve_maybe_delete (s6_fdholder_t *, char const *, int, tain_t const *, tain_t *) ; -#define s6_fdholder_retrieve_maybe_delete_g (a, id, h, deadline) s6_fdholder_retrieve(a, id, h, (deadline), &STAMP) +#define s6_fdholder_retrieve_maybe_delete_g(a, id, h, deadline) s6_fdholder_retrieve_maybe_delete(a, id, h, (deadline), &STAMP) #define s6_fdholder_retrieve(a, id, deadline, stamp) s6_fdholder_retrieve_maybe_delete(a, id, 0, deadline, stamp) -#define s6_fdholder_retrieve_g (a, id, deadline) s6_fdholder_retrieve(a, id, (deadline), &STAMP) +#define s6_fdholder_retrieve_g(a, id, deadline) s6_fdholder_retrieve(a, id, (deadline), &STAMP) #define s6_fdholder_retrieve_delete(a, id, deadline, stamp) s6_fdholder_retrieve_maybe_delete(a, id, 1, deadline, stamp) -#define s6_fdholder_retrieve_delete_g (a, id, deadline) s6_fdholder_retrieve(a, id, (deadline), &STAMP) +#define s6_fdholder_retrieve_delete_g(a, id, deadline) s6_fdholder_retrieve(a, id, (deadline), &STAMP) typedef struct s6_fdholder_list_result_s s6_fdholder_list_result_t, *s6_fdholder_list_result_t_ref ; struct s6_fdholder_list_result_s @@ -74,7 +74,7 @@ struct s6_fdholder_fd_s } ; extern int s6_fdholder_getdump (s6_fdholder_t *, genalloc *, tain_t const *, tain_t *) ; -#define s6_fdholder_getdump_g(a, g, deadline) s6_fdholder_getdump_g(a, g, (deadline), &STAMP) +#define s6_fdholder_getdump_g(a, g, deadline) s6_fdholder_getdump(a, g, (deadline), &STAMP) extern int s6_fdholder_setdump (s6_fdholder_t *, s6_fdholder_fd_t const *, unsigned int, tain_t const *, tain_t *) ; #define s6_fdholder_setdump_g(a, list, n, deadline) s6_fdholder_setdump(a, list, n, (deadline), &STAMP) |