aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-05-03 20:00:00 +0000
committerGravatar Rob Landley <rob@landley.net>2006-05-03 20:00:00 +0000
commit2584e9b39f18c8d85730fc7eed96183495c32ecc (patch)
tree60e873715b20bf9698c537302249dc81c849cb41 /miscutils
parent0f0b645f7355e43bae0476acbee1363c94ed70bb (diff)
downloadbusybox-2584e9b39f18c8d85730fc7eed96183495c32ecc.tar.gz
busybox-2584e9b39f18c8d85730fc7eed96183495c32ecc.tar.bz2
Remove HDIO_GETGEO_BIG which is dead (removed from 2.6) and was pointless back
in 2.4 (it fetched the same hd_geometry struct only with uint cylinders instead of ushort cylinders: nothing that big has ever accurately reported gemoetry, it's all LBA. Also stop declaring the hd_geometry struct static: it's two chars, a short, and a long for a grand total of 8 bytes. That can go on the stack.
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/hdparm.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 5c02a347e..f237d32f5 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -2143,21 +2143,13 @@ static void process_dev(char *devname)
}
if (verbose || get_geom)
{
- static const char msg[] = " geometry = %u/%u/%u, sectors = %ld, start = %ld\n";
- static struct hd_geometry g;
-#ifdef HDIO_GETGEO_BIG
- static struct hd_big_geometry bg;
-#endif
-
if (!bb_ioctl(fd, BLKGETSIZE, &parm, "BLKGETSIZE"))
{
-#ifdef HDIO_GETGEO_BIG
- if (!bb_ioctl(fd, HDIO_GETGEO_BIG, &bg, "HDIO_GETGEO_BIG"))
- printf(msg, bg.cylinders, bg.heads, bg.sectors, parm, bg.start);
- else
-#endif
+ struct hd_geometry g;
+
if (!bb_ioctl(fd, HDIO_GETGEO, &g, "HDIO_GETGEO"))
- printf(msg, g.cylinders, g.heads, g.sectors, parm, g.start);
+ printf(" geometry = %u/%u/%u, sectors = %ld, start = %ld\n",
+ g.cylinders, g.heads, g.sectors, parm, g.start);
}
}
#ifdef HDIO_DRIVE_CMD