[BusyBox-cvs] busybox/miscutils hdparm.c,1.9,1.10

Erik Andersen andersen at busybox.net
Sat Feb 14 21:33:41 UTC 2004


Update of /var/cvs/busybox/miscutils
In directory nail:/tmp/cvs-serv19044/miscutils

Modified Files:
	hdparm.c 
Log Message:
Avoid naming conflict with symbol in newer glibc headers


Index: hdparm.c
===================================================================
RCS file: /var/cvs/busybox/miscutils/hdparm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hdparm.c	12 Dec 2003 00:08:57 -0000	1.9
+++ hdparm.c	14 Feb 2004 21:33:39 -0000	1.10
@@ -1238,7 +1238,7 @@
 static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
 static int do_ctimings, do_timings = 0;
 
-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
+static unsigned long set_readahead= 0, get_readahead= 0, bbreadahead= 0;
 static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
 static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;
 static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
@@ -1948,8 +1948,8 @@
 
 	if (set_readahead)
 	{
-		if_printf(get_readahead," setting fs readahead to %ld\n", readahead);
-		bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET");
+		if_printf(get_readahead," setting fs readahead to %ld\n", bbreadahead);
+		bb_ioctl(fd, BLKRASET,(int *)bbreadahead,"BLKRASET");
 	}
 #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
 	if (unregister_hwif)
@@ -2839,7 +2839,7 @@
 						while (isdigit(*p))
 						{
 							set_readahead = 1;
-							readahead = (readahead * 10) + (*p++ - '0');
+							bbreadahead = (bbreadahead * 10) + (*p++ - '0');
 						}
 						break;
 					case 'B':




More information about the busybox-cvs mailing list