summaryrefslogtreecommitdiff
path: root/util-linux/fdformat.c
diff options
context:
space:
mode:
authorDenis Vlasenko2007-07-14 22:07:14 +0000
committerDenis Vlasenko2007-07-14 22:07:14 +0000
commitfb79a2e2cfe33002398f1898c26d8e4f341db006 (patch)
treef5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /util-linux/fdformat.c
parentfcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff)
downloadbusybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip
busybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta do_iptunnel 203 977 +774 process_dev 5328 5494 +166 ioctl_or_perror - 54 +54 ioctl_or_perror_and_die - 51 +51 ioctl_alt_func - 49 +49 bb_ioctl_or_warn - 47 +47 do_add_ioctl 102 145 +43 bb_xioctl - 39 +39 print_value_on_off - 31 +31 get_lcm 105 123 +18 arp_main 2155 2167 +12 .................. zcip_main 1576 1566 -10 setlogcons_main 92 82 -10 dumpkmap_main 263 253 -10 do_get_ioctl 85 75 -10 setkeycodes_main 165 154 -11 write_table 244 232 -12 vconfig_main 318 306 -12 do_del_ioctl 93 81 -12 set_address 75 62 -13 maybe_set_utc 30 16 -14 loadfont_main 495 479 -16 slattach_main 712 695 -17 do_loadfont 191 174 -17 do_iplink 1155 1136 -19 getty_main 2583 2562 -21 fbset_main 2058 2035 -23 do_time 588 565 -23 xioctl 25 - -25 read_rtc 186 160 -26 parse_conf 1299 1270 -29 udhcp_read_interface 269 239 -30 bb_ioctl 45 - -45 bb_ioctl_alt 70 - -70 bb_ioctl_on_off 78 - -78 .rodata 129370 129018 -352 do_show 799 - -799 ------------------------------------------------------------------------------ (add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes text data bss dec hex filename 675352 2740 13968 692060 a8f5c busybox_old 674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'util-linux/fdformat.c')
-rw-r--r--util-linux/fdformat.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index e9fbeee..5e253ef 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -45,13 +45,6 @@ struct format_descr {
#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
#define FD_FILL_BYTE 0xF6 /* format fill byte. */
-static void xioctl(int fd, int request, void *argp, const char *string)
-{
- if (ioctl(fd, request, argp) < 0) {
- bb_perror_msg_and_die(string);
- }
-}
-
int fdformat_main(int argc,char **argv);
int fdformat_main(int argc,char **argv)
{
@@ -77,7 +70,7 @@ int fdformat_main(int argc,char **argv)
fd = xopen(*argv, O_RDWR);
/* original message was: "Could not determine current format type" */
- xioctl(fd, FDGETPRM, &param, "FDGETPRM");
+ xioctl(fd, FDGETPRM, &param);
printf("%s-sided, %d tracks, %d sec/track. Total capacity %d kB\n",
(param.head == 2) ? "Double" : "Single",
@@ -85,21 +78,21 @@ int fdformat_main(int argc,char **argv)
/* FORMAT */
printf("Formatting... ");
- xioctl(fd, FDFMTBEG, NULL, "FDFMTBEG");
+ xioctl(fd, FDFMTBEG, NULL);
/* n == track */
for (n = 0; n < param.track; n++) {
descr.head = 0;
descr.track = n;
- xioctl(fd, FDFMTTRK, &descr, "FDFMTTRK");
+ xioctl(fd, FDFMTTRK, &descr);
printf("%3d\b\b\b", n);
if (param.head == 2) {
descr.head = 1;
- xioctl(fd, FDFMTTRK, &descr, "FDFMTTRK");
+ xioctl(fd, FDFMTTRK, &descr);
}
}
- xioctl(fd, FDFMTEND, NULL, "FDFMTEND");
+ xioctl(fd, FDFMTEND, NULL);
printf("done\n");
/* VERIFY */