Merge branch 'jk/trace-sifter'

diff --git a/transport-helper.c b/transport-helper.c
index 4e4754c32bd53f28f9335c2a4529f5804f3086f2..0c5b1bd994d79cd6441a5c956a2d851b6bea7d5f 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -12,8 +12,7 @@
 
 static int debug;
 
-struct helper_data
-{
+struct helper_data {
        const char *name;
        struct child_process *helper;
        FILE *out;
@@ -973,7 +972,7 @@ static int udt_do_read(struct unidirectional_transfer *t)
  */
 static int udt_do_write(struct unidirectional_transfer *t)
 {
-       size_t bytes;
+       ssize_t bytes;
 
        if (t->bufuse == 0)
                return 0;       /* Nothing to write. */