summaryrefslogtreecommitdiff
path: root/src/fdholder
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-02-08 22:24:51 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-02-08 22:24:51 +0000
commit49d082377b0614f6cf8503be0699524f936776c0 (patch)
treeb0bfec811816721da9726c7cef9d6a93aabb8362 /src/fdholder
parent502bfd940bfc39fe4eb256d8bd06cc5a15c098d3 (diff)
downloads6-49d082377b0614f6cf8503be0699524f936776c0.tar.xz
- cosmetic fixes in s6-fdholderd
- timestamp length bugfix in s6-log
Diffstat (limited to 'src/fdholder')
-rw-r--r--src/fdholder/s6-fdholderd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c
index c5a29e2..b9091d2 100644
--- a/src/fdholder/s6-fdholderd.c
+++ b/src/fdholder/s6-fdholderd.c
@@ -452,8 +452,6 @@ static int do_setdump_data (unsigned int cc, unixmessage_t const *m)
tain_unpack(s, &p->limit) ;
byte_copy(p->id, idlen+1, s + TAIN_PACK + 1) ;
p->fd = m->fds[i] ;
- char fmt[TIMESTAMP] ;
- fmt[timestamp_fmt(fmt, &p->limit)] = 0 ;
avltreen_insert(fds_by_id, indices[i]) ;
avltreen_insert(fds_by_deadline, indices[i]) ;
s += TAIN_PACK + 2 + idlen ; len -= TAIN_PACK + 2 + idlen ;
@@ -802,6 +800,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
else client_add(&i, fd, &rre, &wre, flags) ;
}
}
- return (~!numfds | (!!numconn << 1)) ;
+ return (!!numfds | (!!numconn << 1)) ;
}
}