summaryrefslogtreecommitdiffstats
path: root/sbin/ggate
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2006-12-15 18:16:47 +0000
committerpjd <pjd@FreeBSD.org>2006-12-15 18:16:47 +0000
commit0571bed7ae0b2e4f6160d4cb7f6776d676cb6b9a (patch)
treecdc950b30aec3be03784a1141fede11fa9f892a0 /sbin/ggate
parent64d068233d479c15dbfc1665a14ca8e850d00f74 (diff)
downloadFreeBSD-src-0571bed7ae0b2e4f6160d4cb7f6776d676cb6b9a.zip
FreeBSD-src-0571bed7ae0b2e4f6160d4cb7f6776d676cb6b9a.tar.gz
Fix ggated for platforms with 64bit size_t. The DIOCGSECTORSIZE ioctl
returns u_int. Reported by: Javier Martín Rueda <jmrueda@diatel.upm.es> PR: amd64/91799 MFC after: 3 days
Diffstat (limited to 'sbin/ggate')
-rw-r--r--sbin/ggate/ggated/ggated.c2
-rw-r--r--sbin/ggate/shared/ggate.c4
-rw-r--r--sbin/ggate/shared/ggate.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index 82d66e1..b0dd2d2 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;
+ u_int 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 5101092..ff72a27 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
+u_int
g_gate_sectorsize(int fd)
{
- size_t secsize;
+ u_int secsize;
struct stat sb;
if (fstat(fd, &sb) == -1)
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index acbdaaa..9a81b0f 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);
+u_int 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);
OpenPOWER on IntegriCloud