diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-01-30 22:48:39 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-01-30 22:48:39 +0000 |
| commit | a68ea1cb93c29125bc4f30ddd415fca02249e010 (patch) | |
| tree | 5741be315758b807145c24da9ff3a1dbf8fce4e8 /miscutils | |
| parent | 9a58b02ec75caafb7214f1ad0317f9a4830cbd2a (diff) | |
| download | busybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.tar.gz busybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.tar.bz2 busybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.zip | |
fix up yet more annoying signed/unsigned and mixed type errors
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/devfsd.c | 3 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index d8a630c04..fce63e54d 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
| @@ -476,7 +476,8 @@ int devfsd_main (int argc, char **argv) | |||
| 476 | if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0) | 476 | if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0) |
| 477 | devfsd_perror_msg_and_die("FD_CLOEXEC"); | 477 | devfsd_perror_msg_and_die("FD_CLOEXEC"); |
| 478 | 478 | ||
| 479 | do_ioctl_and_die(fd, DEVFSDIOC_GET_PROTO_REV,(int )&proto_rev); | 479 | if (ioctl (fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev) == -1) |
| 480 | msg_logger_and_die(LOG_ERR, "ioctl"); | ||
| 480 | 481 | ||
| 481 | /*setup initial entries */ | 482 | /*setup initial entries */ |
| 482 | for (curr = initial_symlinks; curr->dest != NULL; ++curr) | 483 | for (curr = initial_symlinks; curr->dest != NULL; ++curr) |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 4bf0d45ce..750cb499b 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
| @@ -1945,7 +1945,7 @@ static void process_dev (char *devname) | |||
| 1945 | { | 1945 | { |
| 1946 | no_scsi(); | 1946 | no_scsi(); |
| 1947 | printf(" attempting to unregister hwif#%u\n", hwif); | 1947 | printf(" attempting to unregister hwif#%u\n", hwif); |
| 1948 | bb_ioctl(fd, HDIO_UNREGISTER_HWIF,(int *)hwif,"HDIO_UNREGISTER_HWIF"); | 1948 | bb_ioctl(fd, HDIO_UNREGISTER_HWIF,(int *)(unsigned long)hwif,"HDIO_UNREGISTER_HWIF"); |
| 1949 | } | 1949 | } |
| 1950 | #endif | 1950 | #endif |
| 1951 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF | 1951 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF |
| @@ -1977,7 +1977,7 @@ static void process_dev (char *devname) | |||
| 1977 | else | 1977 | else |
| 1978 | printf("set UDMA mode to %d\n", (piomode-200)); | 1978 | printf("set UDMA mode to %d\n", (piomode-200)); |
| 1979 | } | 1979 | } |
| 1980 | bb_ioctl(fd, HDIO_SET_PIO_MODE, (int *)piomode, "HDIO_SET_PIO_MODE"); | 1980 | bb_ioctl(fd, HDIO_SET_PIO_MODE, (int *)(unsigned long)piomode, "HDIO_SET_PIO_MODE"); |
| 1981 | } | 1981 | } |
| 1982 | if (set_io32bit) | 1982 | if (set_io32bit) |
| 1983 | { | 1983 | { |
| @@ -2435,7 +2435,7 @@ identify_abort: | |||
| 2435 | printf(" setting bus state to %d", busstate); | 2435 | printf(" setting bus state to %d", busstate); |
| 2436 | bus_state_value(busstate); | 2436 | bus_state_value(busstate); |
| 2437 | } | 2437 | } |
| 2438 | bb_ioctl(fd, HDIO_SET_BUSSTATE, (int *)busstate, "HDIO_SET_BUSSTATE"); | 2438 | bb_ioctl(fd, HDIO_SET_BUSSTATE, (int *)(unsigned long)busstate, "HDIO_SET_BUSSTATE"); |
| 2439 | } | 2439 | } |
| 2440 | #endif | 2440 | #endif |
| 2441 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF | 2441 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF |