diff options
Diffstat (limited to 'src/libskabus')
44 files changed, 60 insertions, 60 deletions
diff --git a/src/libskabus/skabus-pub-internal.h b/src/libskabus/skabus-pub-internal.h index efe8bb9..32fb4b5 100644 --- a/src/libskabus/skabus-pub-internal.h +++ b/src/libskabus/skabus-pub-internal.h @@ -7,6 +7,6 @@ #define SKABUS_HEAD_MAX 64 -extern unixmessage_handler_func_t skabus_pub_send_cb ; +extern unixmessage_handler_func skabus_pub_send_cb ; #endif diff --git a/src/libskabus/skabus-rpc-internal.h b/src/libskabus/skabus-rpc-internal.h index 04f29e4..8a590b8 100644 --- a/src/libskabus/skabus-rpc-internal.h +++ b/src/libskabus/skabus-rpc-internal.h @@ -9,12 +9,12 @@ #include <skalibs/unixmessage.h> #include <skabus/rpc.h> -extern int skabus_rpc_sendq_withfds_async (skabus_rpc_t *, char const *, size_t, char const *, char const *, size_t, int const *, unsigned int, unsigned char const *, tain_t const *, skabus_rpc_send_result_t *) ; -extern uint64_t skabus_rpc_sendq_withfds (skabus_rpc_t *, char const *, size_t, char const *, char const *, size_t, int const *, unsigned int, unsigned char const *, tain_t const *, tain_t const *, tain_t *) ; -extern int skabus_rpc_sendvq_withfds_async (skabus_rpc_t *, char const *, size_t, char const *, struct iovec const *, unsigned int, int const *, unsigned int, unsigned char const *, tain_t const *, skabus_rpc_send_result_t *) ; -extern uint64_t skabus_rpc_sendvq_withfds (skabus_rpc_t *, char const *, size_t, char const *, struct iovec const *, unsigned int, int const *, unsigned int, unsigned char const *, tain_t const *, tain_t const *, tain_t *) ; +extern int skabus_rpc_sendq_withfds_async (skabus_rpc_t *, char const *, size_t, char const *, char const *, size_t, int const *, unsigned int, unsigned char const *, tain const *, skabus_rpc_send_result_t *) ; +extern uint64_t skabus_rpc_sendq_withfds (skabus_rpc_t *, char const *, size_t, char const *, char const *, size_t, int const *, unsigned int, unsigned char const *, tain const *, tain const *, tain *) ; +extern int skabus_rpc_sendvq_withfds_async (skabus_rpc_t *, char const *, size_t, char const *, struct iovec const *, unsigned int, int const *, unsigned int, unsigned char const *, tain const *, skabus_rpc_send_result_t *) ; +extern uint64_t skabus_rpc_sendvq_withfds (skabus_rpc_t *, char const *, size_t, char const *, struct iovec const *, unsigned int, int const *, unsigned int, unsigned char const *, tain const *, tain const *, tain *) ; -extern unixmessage_handler_func_t skabus_rpc_send_cb ; -extern unixmessage_handler_func_t skabus_rpc_interface_register_cb ; +extern unixmessage_handler_func skabus_rpc_send_cb ; +extern unixmessage_handler_func skabus_rpc_interface_register_cb ; #endif diff --git a/src/libskabus/skabus_pub_list.c b/src/libskabus/skabus_pub_list.c index 4b8ceeb..0f7a4e3 100644 --- a/src/libskabus/skabus_pub_list.c +++ b/src/libskabus/skabus_pub_list.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -int skabus_pub_list (skabus_pub_t *a, stralloc *sa, diuint32 *n, tain_t const *deadline, tain_t *stamp) +int skabus_pub_list (skabus_pub_t *a, stralloc *sa, diuint32 *n, tain const *deadline, tain *stamp) { skabus_pub_list_result_t r ; if (!skabus_pub_list_async(a, sa, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_list_async.c b/src/libskabus/skabus_pub_list_async.c index 48797b5..a809f43 100644 --- a/src/libskabus/skabus_pub_list_async.c +++ b/src/libskabus/skabus_pub_list_async.c @@ -11,7 +11,7 @@ #include <skabus/pub.h> -static int skabus_pub_list_cb (unixmessage_t const *m, void *p) +static int skabus_pub_list_cb (unixmessage const *m, void *p) { skabus_pub_list_result_t *r = p ; uint32_t n ; diff --git a/src/libskabus/skabus_pub_register.c b/src/libskabus/skabus_pub_register.c index 30a08a3..4503990 100644 --- a/src/libskabus/skabus_pub_register.c +++ b/src/libskabus/skabus_pub_register.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -int skabus_pub_register (skabus_pub_t *a, char const *id, char const *sre, char const *wre, tain_t const *deadline, tain_t *stamp) +int skabus_pub_register (skabus_pub_t *a, char const *id, char const *sre, char const *wre, tain const *deadline, tain *stamp) { unsigned char r ; if (!skabus_pub_register_async(a, id, sre, wre, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_send.c b/src/libskabus/skabus_pub_send.c index f41ede3..ffbeac9 100644 --- a/src/libskabus/skabus_pub_send.c +++ b/src/libskabus/skabus_pub_send.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -uint64_t skabus_pub_send_withfds (skabus_pub_t *a, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_pub_send_withfds (skabus_pub_t *a, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { skabus_pub_send_result_t r ; if (!skabus_pub_send_withfds_async(a, s, len, fds, nfds, bits, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_send_async.c b/src/libskabus/skabus_pub_send_async.c index 1a2bb58..214f541 100644 --- a/src/libskabus/skabus_pub_send_async.c +++ b/src/libskabus/skabus_pub_send_async.c @@ -11,6 +11,6 @@ int skabus_pub_send_withfds_async (skabus_pub_t *a, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, skabus_pub_send_result_t *result) { struct iovec v[2] = { { .iov_base = "!", .iov_len = 1 }, { .iov_base = (char *)s, .iov_len = len } } ; - unixmessage_v_t m = { .v = v, .vlen = 2, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = v, .vlen = 2, .fds = (int *)fds, .nfds = nfds } ; return skaclient_putmsgv_and_close(&a->connection, &m, bits, &skabus_pub_send_cb, result) ; } diff --git a/src/libskabus/skabus_pub_send_cb.c b/src/libskabus/skabus_pub_send_cb.c index e95ab6c..008a280 100644 --- a/src/libskabus/skabus_pub_send_cb.c +++ b/src/libskabus/skabus_pub_send_cb.c @@ -8,7 +8,7 @@ #include <skabus/pub.h> -int skabus_pub_send_cb (unixmessage_t const *m, void *p) +int skabus_pub_send_cb (unixmessage const *m, void *p) { skabus_pub_send_result_t *r = p ; if (!m->len || m->nfds) return (errno = EPROTO, 0) ; diff --git a/src/libskabus/skabus_pub_sendpm.c b/src/libskabus/skabus_pub_sendpm.c index 073633a..d1a73ef 100644 --- a/src/libskabus/skabus_pub_sendpm.c +++ b/src/libskabus/skabus_pub_sendpm.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -uint64_t skabus_pub_sendpm_withfds (skabus_pub_t *a, char const *id, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_pub_sendpm_withfds (skabus_pub_t *a, char const *id, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { skabus_pub_send_result_t r ; if (!skabus_pub_sendpm_withfds_async(a, id, s, len, fds, nfds, bits, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_sendpm_async.c b/src/libskabus/skabus_pub_sendpm_async.c index d43b01f..dd7aeec 100644 --- a/src/libskabus/skabus_pub_sendpm_async.c +++ b/src/libskabus/skabus_pub_sendpm_async.c @@ -20,7 +20,7 @@ int skabus_pub_sendpm_withfds_async (skabus_pub_t *a, char const *idstr, char co { .iov_base = (char *)idstr, .iov_len = idlen+1 }, { .iov_base = (char *)s, .iov_len = len } } ; - unixmessage_v_t m = { .v = v, .vlen = 3, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = v, .vlen = 3, .fds = (int *)fds, .nfds = nfds } ; if (idlen > SKABUS_PUB_IDSTR_SIZE) return (errno = ERANGE, 0) ; tmp[1] = (unsigned char)idlen ; return skaclient_putmsgv_and_close(&a->connection, &m, bits, &skabus_pub_send_cb, result) ; diff --git a/src/libskabus/skabus_pub_sendv.c b/src/libskabus/skabus_pub_sendv.c index ff1c743..bc4fa1f 100644 --- a/src/libskabus/skabus_pub_sendv.c +++ b/src/libskabus/skabus_pub_sendv.c @@ -7,7 +7,7 @@ #include <skabus/pub.h> -uint64_t skabus_pub_sendv_withfds (skabus_pub_t *a, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_pub_sendv_withfds (skabus_pub_t *a, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { skabus_pub_send_result_t r ; if (!skabus_pub_sendv_withfds_async(a, v, vlen, fds, nfds, bits, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_sendv_async.c b/src/libskabus/skabus_pub_sendv_async.c index 54ce94e..8f4e6e0 100644 --- a/src/libskabus/skabus_pub_sendv_async.c +++ b/src/libskabus/skabus_pub_sendv_async.c @@ -11,7 +11,7 @@ int skabus_pub_sendv_withfds_async (skabus_pub_t *a, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, skabus_pub_send_result_t *result) { struct iovec vv[vlen+1] ; - unixmessage_v_t m = { .v = vv, .vlen = vlen+1, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = vv, .vlen = vlen+1, .fds = (int *)fds, .nfds = nfds } ; vv[0].iov_base = "!" ; vv[0].iov_len = 1 ; for (unsigned int i = 0 ; i < vlen ; i++) vv[1+i] = v[i] ; return skaclient_putmsgv_and_close(&a->connection, &m, bits, &skabus_pub_send_cb, result) ; diff --git a/src/libskabus/skabus_pub_sendvpm.c b/src/libskabus/skabus_pub_sendvpm.c index a898bbc..58ce243 100644 --- a/src/libskabus/skabus_pub_sendvpm.c +++ b/src/libskabus/skabus_pub_sendvpm.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -uint64_t skabus_pub_sendvpm_withfds (skabus_pub_t *a, char const *idstr, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_pub_sendvpm_withfds (skabus_pub_t *a, char const *idstr, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { skabus_pub_send_result_t r ; if (!skabus_pub_sendvpm_withfds_async(a, idstr, v, vlen, fds, nfds, bits, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_sendvpm_async.c b/src/libskabus/skabus_pub_sendvpm_async.c index b1bab4d..82fd7e6 100644 --- a/src/libskabus/skabus_pub_sendvpm_async.c +++ b/src/libskabus/skabus_pub_sendvpm_async.c @@ -15,7 +15,7 @@ int skabus_pub_sendvpm_withfds_async (skabus_pub_t *a, char const *idstr, struct size_t idlen = strlen(idstr) ; char tmp[2] = "+" ; struct iovec vv[vlen + 2] ; - unixmessage_v_t m = { .v = vv, .vlen = vlen + 2, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = vv, .vlen = vlen + 2, .fds = (int *)fds, .nfds = nfds } ; if (idlen > SKABUS_PUB_IDSTR_SIZE) return (errno = ERANGE, 0) ; tmp[1] = (unsigned char)idlen ; vv[0].iov_base = tmp ; vv[0].iov_len = 2 ; diff --git a/src/libskabus/skabus_pub_start.c b/src/libskabus/skabus_pub_start.c index d72b0f7..3cb3177 100644 --- a/src/libskabus/skabus_pub_start.c +++ b/src/libskabus/skabus_pub_start.c @@ -4,7 +4,7 @@ #include <skabus/pub.h> -int skabus_pub_start (skabus_pub_t *a, char const *path, tain_t const *deadline, tain_t *stamp) +int skabus_pub_start (skabus_pub_t *a, char const *path, tain const *deadline, tain *stamp) { return skaclient_start_b( &a->connection, diff --git a/src/libskabus/skabus_pub_subunsub.c b/src/libskabus/skabus_pub_subunsub.c index 29e61f1..e45b143 100644 --- a/src/libskabus/skabus_pub_subunsub.c +++ b/src/libskabus/skabus_pub_subunsub.c @@ -6,7 +6,7 @@ #include <skabus/pub.h> -int skabus_pub_subunsub (skabus_pub_t *a, char what, char const *id, tain_t const *deadline, tain_t *stamp) +int skabus_pub_subunsub (skabus_pub_t *a, char what, char const *id, tain const *deadline, tain *stamp) { unsigned char r ; if (!skabus_pub_subunsub_async(a, what, id, &r)) return 0 ; diff --git a/src/libskabus/skabus_pub_update.c b/src/libskabus/skabus_pub_update.c index 46e699c..859c562 100644 --- a/src/libskabus/skabus_pub_update.c +++ b/src/libskabus/skabus_pub_update.c @@ -14,7 +14,7 @@ #include <skabus/pub.h> -static int handler (unixmessage_t const *m, void *x) +static int handler (unixmessage const *m, void *x) { skabus_pub_t *a = (skabus_pub_t *)x ; size_t n = genalloc_len(skabus_pub_cltinfo_t, &a->info) ; diff --git a/src/libskabus/skabus_rpc_cancel.c b/src/libskabus/skabus_rpc_cancel.c index fe77d48..ad8bf6a 100644 --- a/src/libskabus/skabus_rpc_cancel.c +++ b/src/libskabus/skabus_rpc_cancel.c @@ -7,7 +7,7 @@ #include <skabus/rpc.h> -int skabus_rpc_cancel (skabus_rpc_t *a, uint64_t serial, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_cancel (skabus_rpc_t *a, uint64_t serial, tain const *deadline, tain *stamp) { unsigned char r ; if (!skabus_rpc_cancel_async(a, serial, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_get.c b/src/libskabus/skabus_rpc_get.c index 0f427f5..958c379 100644 --- a/src/libskabus/skabus_rpc_get.c +++ b/src/libskabus/skabus_rpc_get.c @@ -9,7 +9,7 @@ #include <skabus/rpc.h> -int skabus_rpc_get (skabus_rpc_t *a, uint64_t serial, int *result, unixmessage_t *m) +int skabus_rpc_get (skabus_rpc_t *a, uint64_t serial, int *result, unixmessage *m) { uint32_t id ; skabus_rpc_qinfo_t *p ; diff --git a/src/libskabus/skabus_rpc_idstr.c b/src/libskabus/skabus_rpc_idstr.c index 29497c4..8e48e85 100644 --- a/src/libskabus/skabus_rpc_idstr.c +++ b/src/libskabus/skabus_rpc_idstr.c @@ -7,7 +7,7 @@ #include <skabus/rpc.h> -int skabus_rpc_idstr (skabus_rpc_t *a, char const *idstr, skabus_rpc_interface_t const *ifbody, char const *re, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_idstr (skabus_rpc_t *a, char const *idstr, skabus_rpc_interface_t const *ifbody, char const *re, tain const *deadline, tain *stamp) { skabus_rpc_interface_result_t r ; if (!skabus_rpc_idstr_async(a, idstr, ifbody, re, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_interface_register.c b/src/libskabus/skabus_rpc_interface_register.c index e4b18d9..d5d525f 100644 --- a/src/libskabus/skabus_rpc_interface_register.c +++ b/src/libskabus/skabus_rpc_interface_register.c @@ -7,7 +7,7 @@ #include <skabus/rpc.h> -int skabus_rpc_interface_register (skabus_rpc_t *a, uint32_t *ifid, char const *ifname, skabus_rpc_interface_t const *ifbody, char const *re, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_interface_register (skabus_rpc_t *a, uint32_t *ifid, char const *ifname, skabus_rpc_interface_t const *ifbody, char const *re, tain const *deadline, tain *stamp) { skabus_rpc_interface_result_t r ; if (!skabus_rpc_interface_register_async(a, ifname, ifbody, re, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_interface_register_cb.c b/src/libskabus/skabus_rpc_interface_register_cb.c index b786794..9ede974 100644 --- a/src/libskabus/skabus_rpc_interface_register_cb.c +++ b/src/libskabus/skabus_rpc_interface_register_cb.c @@ -9,7 +9,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_interface_register_cb (unixmessage_t const *m, void *p) +int skabus_rpc_interface_register_cb (unixmessage const *m, void *p) { skabus_rpc_interface_result_t *r = p ; if (m->len != 1 || m->nfds) return (errno = EPROTO, 0) ; diff --git a/src/libskabus/skabus_rpc_interface_unregister.c b/src/libskabus/skabus_rpc_interface_unregister.c index add587c..793b954 100644 --- a/src/libskabus/skabus_rpc_interface_unregister.c +++ b/src/libskabus/skabus_rpc_interface_unregister.c @@ -7,7 +7,7 @@ #include <skabus/rpc.h> -int skabus_rpc_interface_unregister (skabus_rpc_t *a, uint32_t ifid, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_interface_unregister (skabus_rpc_t *a, uint32_t ifid, tain const *deadline, tain *stamp) { skabus_rpc_interface_result_t r ; if (!skabus_rpc_interface_unregister_async(a, ifid, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_interface_unregister_async.c b/src/libskabus/skabus_rpc_interface_unregister_async.c index daa4a11..819a868 100644 --- a/src/libskabus/skabus_rpc_interface_unregister_async.c +++ b/src/libskabus/skabus_rpc_interface_unregister_async.c @@ -11,7 +11,7 @@ #include <skabus/rpc.h> -static int skabus_rpc_interface_unregister_cb (unixmessage_t const *m, void *p) +static int skabus_rpc_interface_unregister_cb (unixmessage const *m, void *p) { skabus_rpc_interface_result_t *r = p ; if (m->len != 1 || m->nfds) return (errno = EPROTO, 0) ; diff --git a/src/libskabus/skabus_rpc_r_notimpl.c b/src/libskabus/skabus_rpc_r_notimpl.c index a8bc026..c947d4b 100644 --- a/src/libskabus/skabus_rpc_r_notimpl.c +++ b/src/libskabus/skabus_rpc_r_notimpl.c @@ -4,7 +4,7 @@ #include <skabus/rpc.h> -int skabus_rpc_r_notimpl (skabus_rpc_t *a, skabus_rpc_rinfo_t const *info, unixmessage_t const *m, void *data) +int skabus_rpc_r_notimpl (skabus_rpc_t *a, skabus_rpc_rinfo_t const *info, unixmessage const *m, void *data) { (void)m ; (void)data ; diff --git a/src/libskabus/skabus_rpc_reply.c b/src/libskabus/skabus_rpc_reply.c index 0b48734..237956d 100644 --- a/src/libskabus/skabus_rpc_reply.c +++ b/src/libskabus/skabus_rpc_reply.c @@ -4,7 +4,7 @@ #include <skabus/rpc.h> -int skabus_rpc_reply_withfds (skabus_rpc_t *a, uint64_t serial, char result, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_reply_withfds (skabus_rpc_t *a, uint64_t serial, char result, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { return skabus_rpc_reply_withfds_async(a, serial, result, s, len, fds, nfds, bits) && skaclient_timed_aflush(&a->connection, deadline, stamp) ; diff --git a/src/libskabus/skabus_rpc_reply_async.c b/src/libskabus/skabus_rpc_reply_async.c index 6f3df39..498c1e0 100644 --- a/src/libskabus/skabus_rpc_reply_async.c +++ b/src/libskabus/skabus_rpc_reply_async.c @@ -12,7 +12,7 @@ int skabus_rpc_reply_withfds_async (skabus_rpc_t *a, uint64_t serial, char resul { char pack[10] = "R" ; struct iovec v[2] = { { .iov_base = pack, .iov_len = 10 }, { .iov_base = (char *)s, .iov_len = len } } ; - unixmessage_v_t m = { .v = v, .vlen = 2, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = v, .vlen = 2, .fds = (int *)fds, .nfds = nfds } ; uint64_pack_big(pack+1, serial) ; pack[9] = result ; return skaclient_aputv_and_close(&a->connection, &m, bits) ; diff --git a/src/libskabus/skabus_rpc_replyv.c b/src/libskabus/skabus_rpc_replyv.c index c972ce4..3c6f092 100644 --- a/src/libskabus/skabus_rpc_replyv.c +++ b/src/libskabus/skabus_rpc_replyv.c @@ -3,7 +3,7 @@ #include <skalibs/skaclient.h> #include <skabus/rpc.h> -int skabus_rpc_replyv_withfds (skabus_rpc_t *a, uint64_t serial, char result, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_replyv_withfds (skabus_rpc_t *a, uint64_t serial, char result, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *deadline, tain *stamp) { return skabus_rpc_replyv_withfds_async(a, serial, result, v, vlen, fds, nfds, bits) && skaclient_timed_aflush(&a->connection, deadline, stamp) ; diff --git a/src/libskabus/skabus_rpc_replyv_async.c b/src/libskabus/skabus_rpc_replyv_async.c index 7bd4397..7c8880a 100644 --- a/src/libskabus/skabus_rpc_replyv_async.c +++ b/src/libskabus/skabus_rpc_replyv_async.c @@ -10,7 +10,7 @@ int skabus_rpc_replyv_withfds_async (skabus_rpc_t *a, uint64_t serial, char resu { char pack[10] = "R" ; struct iovec vv[vlen + 1] ; - unixmessage_v_t m = { .v = vv, .vlen = vlen+1, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = vv, .vlen = vlen+1, .fds = (int *)fds, .nfds = nfds } ; vv[0].iov_base = pack ; vv[0].iov_len = 10 ; for (unsigned int i = 0 ; i < vlen ; i++) vv[1+i] = v[i] ; uint64_pack_big(pack+1, serial) ; diff --git a/src/libskabus/skabus_rpc_send.c b/src/libskabus/skabus_rpc_send.c index aa0131c..08a10eb 100644 --- a/src/libskabus/skabus_rpc_send.c +++ b/src/libskabus/skabus_rpc_send.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_send_withfds (skabus_rpc_t *a, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_send_withfds (skabus_rpc_t *a, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { return skabus_rpc_sendq_withfds(a, 0, 0, ifname, s, len, fds, nfds, bits, limit, deadline, stamp) ; } diff --git a/src/libskabus/skabus_rpc_send_async.c b/src/libskabus/skabus_rpc_send_async.c index 7fc29d2..04cdf99 100644 --- a/src/libskabus/skabus_rpc_send_async.c +++ b/src/libskabus/skabus_rpc_send_async.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_send_withfds_async (skabus_rpc_t *a, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_send_withfds_async (skabus_rpc_t *a, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { return skabus_rpc_sendq_withfds_async(a, 0, 0, ifname, s, len, fds, nfds, bits, limit, r) ; } diff --git a/src/libskabus/skabus_rpc_send_cb.c b/src/libskabus/skabus_rpc_send_cb.c index 52cb5c0..4156dfb 100644 --- a/src/libskabus/skabus_rpc_send_cb.c +++ b/src/libskabus/skabus_rpc_send_cb.c @@ -13,14 +13,14 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -static int autocancel_cb (unixmessage_t const *m, void *p) +static int autocancel_cb (unixmessage const *m, void *p) { (void)m ; (void)p ; return 1 ; } -int skabus_rpc_send_cb (unixmessage_t const *m, void *p) +int skabus_rpc_send_cb (unixmessage const *m, void *p) { skabus_rpc_send_result_t *r = p ; skabus_rpc_qinfo_t *info = GENSETDYN_P(skabus_rpc_qinfo_t, &r->a->q, r->i) ; diff --git a/src/libskabus/skabus_rpc_sendpm.c b/src/libskabus/skabus_rpc_sendpm.c index 5f175e4..9488d39 100644 --- a/src/libskabus/skabus_rpc_sendpm.c +++ b/src/libskabus/skabus_rpc_sendpm.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_sendpm_withfds (skabus_rpc_t *a, char const *cname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_sendpm_withfds (skabus_rpc_t *a, char const *cname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { return skabus_rpc_sendq_withfds(a, "\xff", 1, cname, s, len, fds, nfds, bits, limit, deadline, stamp) ; } diff --git a/src/libskabus/skabus_rpc_sendpm_async.c b/src/libskabus/skabus_rpc_sendpm_async.c index b1b09d4..f3fdd99 100644 --- a/src/libskabus/skabus_rpc_sendpm_async.c +++ b/src/libskabus/skabus_rpc_sendpm_async.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_sendpm_withfds_async (skabus_rpc_t *a, char const *cname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_sendpm_withfds_async (skabus_rpc_t *a, char const *cname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { return skabus_rpc_sendq_withfds_async(a, "\xff", 1, cname, s, len, fds, nfds, bits, limit, r) ; } diff --git a/src/libskabus/skabus_rpc_sendq.c b/src/libskabus/skabus_rpc_sendq.c index ac31551..b828d4f 100644 --- a/src/libskabus/skabus_rpc_sendq.c +++ b/src/libskabus/skabus_rpc_sendq.c @@ -7,7 +7,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_sendq_withfds (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_sendq_withfds (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { skabus_rpc_send_result_t r ; if (!skabus_rpc_sendq_withfds_async(a, prefix, plen, ifname, s, len, fds, nfds, bits, limit, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_sendq_async.c b/src/libskabus/skabus_rpc_sendq_async.c index 7202500..534e962 100644 --- a/src/libskabus/skabus_rpc_sendq_async.c +++ b/src/libskabus/skabus_rpc_sendq_async.c @@ -12,12 +12,12 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_sendq_withfds_async (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_sendq_withfds_async (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, char const *s, size_t len, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { size_t iflen = strlen(ifname) ; char pack[2 + TAIN_PACK] = "Q" ; struct iovec v[4] = { { .iov_base = pack, .iov_len = 2 + TAIN_PACK }, { .iov_base = (char *)prefix, .iov_len = plen }, { .iov_base = (char *)ifname, .iov_len = iflen + 1 }, { .iov_base = (char *)s, .iov_len = len } } ; - unixmessage_v_t m = { .v = v, .vlen = 4, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = v, .vlen = 4, .fds = (int *)fds, .nfds = nfds } ; iflen += plen ; if (iflen > SKABUS_RPC_INTERFACE_MAXLEN) return (errno = ENAMETOOLONG, 0) ; if (!gensetdyn_new(&a->q, &r->i)) return 0 ; diff --git a/src/libskabus/skabus_rpc_sendv.c b/src/libskabus/skabus_rpc_sendv.c index 24d598d..4f907a0 100644 --- a/src/libskabus/skabus_rpc_sendv.c +++ b/src/libskabus/skabus_rpc_sendv.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_sendv_withfds (skabus_rpc_t *a, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_sendv_withfds (skabus_rpc_t *a, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { return skabus_rpc_sendvq_withfds(a, 0, 0, ifname, v, vlen, fds, nfds, bits, limit, deadline, stamp) ; } diff --git a/src/libskabus/skabus_rpc_sendv_async.c b/src/libskabus/skabus_rpc_sendv_async.c index c9b7910..791fd08 100644 --- a/src/libskabus/skabus_rpc_sendv_async.c +++ b/src/libskabus/skabus_rpc_sendv_async.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_sendv_withfds_async (skabus_rpc_t *a, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_sendv_withfds_async (skabus_rpc_t *a, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { return skabus_rpc_sendvq_withfds_async(a, 0, 0, ifname, v, vlen, fds, nfds, bits, limit, r) ; } diff --git a/src/libskabus/skabus_rpc_sendvpm.c b/src/libskabus/skabus_rpc_sendvpm.c index 8ca74e6..a145dae 100644 --- a/src/libskabus/skabus_rpc_sendvpm.c +++ b/src/libskabus/skabus_rpc_sendvpm.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_sendvpm_withfds (skabus_rpc_t *a, char const *cname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_sendvpm_withfds (skabus_rpc_t *a, char const *cname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { return skabus_rpc_sendvq_withfds(a, "\xff", 1, cname, v, vlen, fds, nfds, bits, limit, deadline, stamp) ; } diff --git a/src/libskabus/skabus_rpc_sendvpm_async.c b/src/libskabus/skabus_rpc_sendvpm_async.c index 090423c..6d4d237 100644 --- a/src/libskabus/skabus_rpc_sendvpm_async.c +++ b/src/libskabus/skabus_rpc_sendvpm_async.c @@ -3,7 +3,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_sendvpm_withfds_async (skabus_rpc_t *a, char const *cname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_sendvpm_withfds_async (skabus_rpc_t *a, char const *cname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { return skabus_rpc_sendvq_withfds_async(a, "\xff", 1, cname, v, vlen, fds, nfds, bits, limit, r) ; } diff --git a/src/libskabus/skabus_rpc_sendvq.c b/src/libskabus/skabus_rpc_sendvq.c index f5313ca..63b48bd 100644 --- a/src/libskabus/skabus_rpc_sendvq.c +++ b/src/libskabus/skabus_rpc_sendvq.c @@ -5,7 +5,7 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -uint64_t skabus_rpc_sendvq_withfds (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, tain_t const *deadline, tain_t *stamp) +uint64_t skabus_rpc_sendvq_withfds (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, tain const *deadline, tain *stamp) { skabus_rpc_send_result_t r ; if (!skabus_rpc_sendvq_withfds_async(a, prefix, plen, ifname, v, vlen, fds, nfds, bits, limit, &r)) return 0 ; diff --git a/src/libskabus/skabus_rpc_sendvq_async.c b/src/libskabus/skabus_rpc_sendvq_async.c index 4fb8da3..2e7b238 100644 --- a/src/libskabus/skabus_rpc_sendvq_async.c +++ b/src/libskabus/skabus_rpc_sendvq_async.c @@ -12,12 +12,12 @@ #include <skabus/rpc.h> #include "skabus-rpc-internal.h" -int skabus_rpc_sendvq_withfds_async (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain_t const *limit, skabus_rpc_send_result_t *r) +int skabus_rpc_sendvq_withfds_async (skabus_rpc_t *a, char const *prefix, size_t plen, char const *ifname, struct iovec const *v, unsigned int vlen, int const *fds, unsigned int nfds, unsigned char const *bits, tain const *limit, skabus_rpc_send_result_t *r) { size_t iflen = strlen(ifname) ; char pack[2 + TAIN_PACK] = "Q" ; struct iovec vv[vlen + 3] ; - unixmessage_v_t m = { .v = vv, .vlen = vlen + 3, .fds = (int *)fds, .nfds = nfds } ; + unixmessagev m = { .v = vv, .vlen = vlen + 3, .fds = (int *)fds, .nfds = nfds } ; iflen += plen ; if (iflen > SKABUS_RPC_INTERFACE_MAXLEN) return (errno = ENAMETOOLONG, 0) ; if (!gensetdyn_new(&a->q, &r->i)) return 0 ; diff --git a/src/libskabus/skabus_rpc_start.c b/src/libskabus/skabus_rpc_start.c index 3e5e332..a39d4ae 100644 --- a/src/libskabus/skabus_rpc_start.c +++ b/src/libskabus/skabus_rpc_start.c @@ -4,7 +4,7 @@ #include <skabus/rpc.h> -int skabus_rpc_start (skabus_rpc_t *a, char const *path, tain_t const *deadline, tain_t *stamp) +int skabus_rpc_start (skabus_rpc_t *a, char const *path, tain const *deadline, tain *stamp) { return skaclient_start_b( &a->connection, diff --git a/src/libskabus/skabus_rpc_update.c b/src/libskabus/skabus_rpc_update.c index 84de1b0..81e7cf5 100644 --- a/src/libskabus/skabus_rpc_update.c +++ b/src/libskabus/skabus_rpc_update.c @@ -17,10 +17,10 @@ #include <skabus/rpc.h> -typedef int localhandler_func_t (skabus_rpc_t *, unixmessage_t *) ; -typedef localhandler_func_t *localhandler_func_t_ref ; +typedef int localhandler_func (skabus_rpc_t *, unixmessage *) ; +typedef localhandler_func *localhandler_func_ref ; -static int skabus_rpc_serve (skabus_rpc_t *a, unixmessage_t *m) +static int skabus_rpc_serve (skabus_rpc_t *a, unixmessage *m) { skabus_rpc_rinfo_t rinfo ; uint32_t ifid ; @@ -34,7 +34,7 @@ static int skabus_rpc_serve (skabus_rpc_t *a, unixmessage_t *m) return (*p->f)(a, &rinfo, m, p->data) ; } -static int skabus_rpc_cancelr (skabus_rpc_t *a, unixmessage_t *m) +static int skabus_rpc_cancelr (skabus_rpc_t *a, unixmessage *m) { uint64_t serial ; uint32_t ifid ; @@ -47,7 +47,7 @@ static int skabus_rpc_cancelr (skabus_rpc_t *a, unixmessage_t *m) return (*p->cancelf)(serial, m->s[12], p->data) ; } -static int skabus_rpc_handle_reply (skabus_rpc_t *a, unixmessage_t *m) +static int skabus_rpc_handle_reply (skabus_rpc_t *a, unixmessage *m) { skabus_rpc_qinfo_t *p ; uint64_t serial ; @@ -84,18 +84,18 @@ static int skabus_rpc_handle_reply (skabus_rpc_t *a, unixmessage_t *m) return 1 ; } -static int skabus_rpc_error (skabus_rpc_t *a, unixmessage_t *m) +static int skabus_rpc_error (skabus_rpc_t *a, unixmessage *m) { (void)a ; (void)m ; return (errno = EPROTO, 0) ; } -static int handler (unixmessage_t const *m, void *x) +static int handler (unixmessage const *m, void *x) { skabus_rpc_t *a = x ; - unixmessage_t mm = { .s = m->s + 1, .len = m->len - 1, .fds = m->fds, .nfds = m->nfds } ; - static localhandler_func_t_ref const f[4] = + unixmessage mm = { .s = m->s + 1, .len = m->len - 1, .fds = m->fds, .nfds = m->nfds } ; + static localhandler_func_ref const f[4] = { &skabus_rpc_serve, &skabus_rpc_handle_reply, |