summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-03-23 10:46:28 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-03-23 10:46:28 +0000
commit1d272ae56707d296c2067306f8c048e54f4e55b0 (patch)
tree32f9c969503285069e977743f9b44c0ec4815f40
parent6b2877c9b5003ebef4a034c8c3899d178dda1d1c (diff)
ssize_t -> size_t, from ntpd, there from Alexander von Gernler
-rw-r--r--usr.sbin/bgpd/bgpd.h4
-rw-r--r--usr.sbin/bgpd/imsg.c5
-rw-r--r--usr.sbin/ospfd/imsg.c5
-rw-r--r--usr.sbin/ospfd/ospfd.h4
4 files changed, 8 insertions, 10 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 9c08c74af0d..ca6c0e412ba 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.159 2005/03/15 10:18:39 henning Exp $ */
+/* $OpenBSD: bgpd.h,v 1.160 2005/03/23 10:46:26 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -143,7 +143,7 @@ struct bgpd_config {
struct buf_read {
u_char buf[READ_BUF_SIZE];
u_char *rptr;
- ssize_t wpos;
+ size_t wpos;
};
enum announce_type {
diff --git a/usr.sbin/bgpd/imsg.c b/usr.sbin/bgpd/imsg.c
index 96029353830..2ff98af6d82 100644
--- a/usr.sbin/bgpd/imsg.c
+++ b/usr.sbin/bgpd/imsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg.c,v 1.34 2005/03/09 14:08:03 henning Exp $ */
+/* $OpenBSD: imsg.c,v 1.35 2005/03/23 10:46:27 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -86,8 +86,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/ospfd/imsg.c b/usr.sbin/ospfd/imsg.c
index e9730b2747d..4759ca7a7d9 100644
--- a/usr.sbin/ospfd/imsg.c
+++ b/usr.sbin/ospfd/imsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg.c,v 1.2 2005/03/09 14:14:01 henning Exp $ */
+/* $OpenBSD: imsg.c,v 1.3 2005/03/23 10:46:26 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -89,8 +89,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/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h
index d1fbc1d0fb2..c00d3f45b87 100644
--- a/usr.sbin/ospfd/ospfd.h
+++ b/usr.sbin/ospfd/ospfd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfd.h,v 1.17 2005/03/22 22:13:48 norby Exp $ */
+/* $OpenBSD: ospfd.h,v 1.18 2005/03/23 10:46:26 henning Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -70,7 +70,7 @@ struct msgbuf {
struct buf_read {
u_char buf[READ_BUF_SIZE];
u_char *rptr;
- ssize_t wpos;
+ size_t wpos;
};
struct imsgbuf {