summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-03-23 10:42:05 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-03-23 10:42:05 +0000
commit6b2877c9b5003ebef4a034c8c3899d178dda1d1c (patch)
tree2ada5bc3cabbd9361617e4ea0967cff1bf41a4af /usr.sbin
parentadfcf818f38c3169da60fffe5722ccc56f7bc1d5 (diff)
wpos in struct buf_read and datalen in imsg_get should be size_t and not
ssize_t From: Alexander von Gernler <grunk@pestilenz.org>
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ntpd/imsg.c5
-rw-r--r--usr.sbin/ntpd/ntpd.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/ntpd/imsg.c b/usr.sbin/ntpd/imsg.c
index 9c62dc0d059..99e46297840 100644
--- a/usr.sbin/ntpd/imsg.c
+++ b/usr.sbin/ntpd/imsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg.c,v 1.9 2005/03/09 14:07:00 henning Exp $ */
+/* $OpenBSD: imsg.c,v 1.10 2005/03/23 10:42:04 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -57,8 +57,7 @@ imsg_read(struct imsgbuf *ibuf)
int
imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
{
- ssize_t datalen = 0;
- size_t av, left;
+ size_t av, left, datalen;
av = ibuf->r.wpos;
diff --git a/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h
index 70ad6709c58..39ec4f68785 100644
--- a/usr.sbin/ntpd/ntpd.h
+++ b/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntpd.h,v 1.53 2005/02/03 10:53:33 dtucker Exp $ */
+/* $OpenBSD: ntpd.h,v 1.54 2005/03/23 10:42:04 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -141,7 +141,7 @@ struct msgbuf {
};
struct buf_read {
- ssize_t wpos;
+ size_t wpos;
u_char buf[READ_BUF_SIZE];
u_char *rptr;
};