From e0f325591afd9b1cb002c2f0fd404a5ab7100d6c Mon Sep 17 00:00:00 2001 From: henning <> Date: Wed, 23 Mar 2005 10:42:04 +0000 Subject: [PATCH] wpos in struct buf_read and datalen in imsg_get should be size_t and not ssize_t From: Alexander von Gernler --- src/usr.sbin/ntpd/imsg.c | 5 ++--- src/usr.sbin/ntpd/ntpd.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/usr.sbin/ntpd/imsg.c b/src/usr.sbin/ntpd/imsg.c index 9c62dc0d..99e46297 100644 --- a/src/usr.sbin/ntpd/imsg.c +++ b/src/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 @@ -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/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h index 70ad6709..39ec4f68 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/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 @@ -141,7 +141,7 @@ struct msgbuf { }; struct buf_read { - ssize_t wpos; + size_t wpos; u_char buf[READ_BUF_SIZE]; u_char *rptr; };