summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorAlexander Guy <alexander@cvs.openbsd.org>2004-06-22 07:59:49 +0000
committerAlexander Guy <alexander@cvs.openbsd.org>2004-06-22 07:59:49 +0000
commit1b80afacf251e030158f8911c83fda74ecae8377 (patch)
tree8a68d6d24ddd63e1173685a313aeb34aee7be677 /usr.sbin
parenta6124400e7bb281fde8b9b389e477a0877dfa025 (diff)
Precedence and type fix; ok henning@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ntpd/ntp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c
index a6b4187db63..3a0f408d583 100644
--- a/usr.sbin/ntpd/ntp.c
+++ b/usr.sbin/ntpd/ntp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntp.c,v 1.8 2004/06/18 04:51:31 henning Exp $ */
+/* $OpenBSD: ntp.c,v 1.9 2004/06/22 07:59:48 alexander Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -118,7 +118,7 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *conf)
if (peer_cnt > idx2peer_elms ||
peer_cnt + IDX2PEER_RESERVE < idx2peer_elms) {
if ((newp = realloc(idx2peer, sizeof(void *) *
- peer_cnt + IDX2PEER_RESERVE)) == NULL) {
+ (peer_cnt + IDX2PEER_RESERVE))) == NULL) {
/* panic for now */
log_warn("could not resize idx2peer from %u -> "
"%u entries", idx2peer_elms,
@@ -132,8 +132,8 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *conf)
new_cnt = PFD_MAX + peer_cnt + listener_cnt;
if (new_cnt > pfd_elms ||
new_cnt + PFD_RESERVE < pfd_elms) {
- if ((newp = realloc(pfd, sizeof(void *) *
- new_cnt + PFD_RESERVE)) == NULL) {
+ if ((newp = realloc(pfd, sizeof(struct pollfd) *
+ (new_cnt + PFD_RESERVE))) == NULL) {
/* panic for now */
log_warn("could not resize pfd from %u -> "
"%u entries", pfd_elms,