From cd3185af4312b9225377d12314b8b44a98aeb9c3 Mon Sep 17 00:00:00 2001 From: pjd Date: Mon, 18 Dec 2006 11:25:02 +0000 Subject: [PATCH] MFC: sbin/ggate/ggated/ggated.c 1.8,1.9 sbin/ggate/shared/ggate.c 1.7,1.8 sbin/ggate/shared/ggate.h 1.4,1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix ggated for platforms with 64bit size_t. The DIOCGSECTORSIZE ioctl returns u_int. Reported by: Javier Martín Rueda PR: amd64/91799 --- sbin/ggate/ggated/ggated.c | 2 +- sbin/ggate/shared/ggate.c | 4 ++-- sbin/ggate/shared/ggate.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c index 82d66e17ad35..b211ccc8592c 100644 --- a/sbin/ggate/ggated/ggated.c +++ b/sbin/ggate/ggated/ggated.c @@ -60,7 +60,7 @@ struct ggd_connection { off_t c_mediasize; - off_t c_sectorsize; + unsigned c_sectorsize; unsigned c_flags; /* flags (RO/RW) */ int c_diskfd; int c_sendfd; diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c index 510109238ac3..09e35d36434a 100644 --- a/sbin/ggate/shared/ggate.c +++ b/sbin/ggate/shared/ggate.c @@ -149,10 +149,10 @@ g_gate_mediasize(int fd) return (mediasize); } -size_t +unsigned g_gate_sectorsize(int fd) { - size_t secsize; + unsigned secsize; struct stat sb; if (fstat(fd, &sb) == -1) diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h index acbdaaa07422..3e26253c360c 100644 --- a/sbin/ggate/shared/ggate.h +++ b/sbin/ggate/shared/ggate.h @@ -98,7 +98,7 @@ void g_gate_log(int priority, const char *message, ...); void g_gate_xvlog(const char *message, va_list ap); void g_gate_xlog(const char *message, ...); off_t g_gate_mediasize(int fd); -size_t g_gate_sectorsize(int fd); +unsigned g_gate_sectorsize(int fd); void g_gate_open_device(void); void g_gate_close_device(void); void g_gate_ioctl(unsigned long req, void *data);