summaryrefslogtreecommitdiff
path: root/src/tls/s6-tlsc-io.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tls/s6-tlsc-io.c')
-rw-r--r--src/tls/s6-tlsc-io.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tls/s6-tlsc-io.c b/src/tls/s6-tlsc-io.c
index 3c9df58..0070f8e 100644
--- a/src/tls/s6-tlsc-io.c
+++ b/src/tls/s6-tlsc-io.c
@@ -16,13 +16,13 @@
#define USAGE "s6-tlsc-io [ -v verbosity ] [ -d notif ] [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k servername ] fdr fdw"
#define dieusage() strerr_dieusage(100, USAGE)
-static inline void doit (int *, tain_t const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ;
+static inline void doit (int *, tain const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ;
#ifdef S6_NETWORKING_USE_TLS
#include <s6-networking/stls.h>
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
{
struct tls *ctx = stls_client_init_and_handshake(fds + 2, tto, preoptions, servername) ;
if (notif)
@@ -53,7 +53,7 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c
return 1 ;
}
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
{
sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ;
if (!random_init()) strerr_diefu1sys(111, "initialize random device") ;
@@ -71,7 +71,7 @@ static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint3
int main (int argc, char const *const *argv, char const *const *envp)
{
char const *servername = 0 ;
- tain_t tto ;
+ tain tto ;
int fds[4] = { 0, 1, 0, 1 } ;
unsigned int verbosity = 1 ;
unsigned int notif = 0 ;
@@ -80,7 +80,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
PROG = "s6-tlsc-io" ;
{
- subgetopt_t l = SUBGETOPT_ZERO ;
+ subgetopt l = SUBGETOPT_ZERO ;
unsigned int t = 0 ;
for (;;)
{
@@ -111,7 +111,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
fds[1] = u ;
}
- if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+ if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
tain_now_set_stopwatch_g() ;
doit(fds, &tto, preoptions, options, verbosity, servername, notif) ;
}