diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-21 03:23:59 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-21 03:23:59 +0000 |
| commit | 5bb2fc2dc1c2239e2f593a69a47ef315cf21c0d9 (patch) | |
| tree | 9ba2cf7e506ecd764d624b655ba8478ea61b998a /libbb/xfuncs_printf.c | |
| parent | 01eaee9309c09ca5d7dc6ef3b2e96084affdab30 (diff) | |
| download | busybox-w32-5bb2fc2dc1c2239e2f593a69a47ef315cf21c0d9.tar.gz busybox-w32-5bb2fc2dc1c2239e2f593a69a47ef315cf21c0d9.tar.bz2 busybox-w32-5bb2fc2dc1c2239e2f593a69a47ef315cf21c0d9.zip | |
tentative fix for ppc64 problems with ioctl.
Zero code size impact.
Diffstat (limited to 'libbb/xfuncs_printf.c')
| -rw-r--r-- | libbb/xfuncs_printf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index dd8687dc6..d3fb39f04 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c | |||
| @@ -451,7 +451,7 @@ void selinux_or_die(void) | |||
| 451 | #endif | 451 | #endif |
| 452 | } | 452 | } |
| 453 | 453 | ||
| 454 | int ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,...) | 454 | int ioctl_or_perror_and_die(int fd, unsigned request, void *argp, const char *fmt,...) |
| 455 | { | 455 | { |
| 456 | int ret; | 456 | int ret; |
| 457 | va_list p; | 457 | va_list p; |
| @@ -467,7 +467,7 @@ int ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,... | |||
| 467 | return ret; | 467 | return ret; |
| 468 | } | 468 | } |
| 469 | 469 | ||
| 470 | int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...) | 470 | int ioctl_or_perror(int fd, unsigned request, void *argp, const char *fmt,...) |
| 471 | { | 471 | { |
| 472 | va_list p; | 472 | va_list p; |
| 473 | int ret = ioctl(fd, request, argp); | 473 | int ret = ioctl(fd, request, argp); |
| @@ -481,7 +481,7 @@ int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...) | |||
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | #if ENABLE_IOCTL_HEX2STR_ERROR | 483 | #if ENABLE_IOCTL_HEX2STR_ERROR |
| 484 | int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name) | 484 | int bb_ioctl_or_warn(int fd, unsigned request, void *argp, const char *ioctl_name) |
| 485 | { | 485 | { |
| 486 | int ret; | 486 | int ret; |
| 487 | 487 | ||
| @@ -490,7 +490,7 @@ int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name) | |||
| 490 | bb_simple_perror_msg(ioctl_name); | 490 | bb_simple_perror_msg(ioctl_name); |
| 491 | return ret; | 491 | return ret; |
| 492 | } | 492 | } |
| 493 | int bb_xioctl(int fd, int request, void *argp, const char *ioctl_name) | 493 | int bb_xioctl(int fd, unsigned request, void *argp, const char *ioctl_name) |
| 494 | { | 494 | { |
| 495 | int ret; | 495 | int ret; |
| 496 | 496 | ||
| @@ -500,7 +500,7 @@ int bb_xioctl(int fd, int request, void *argp, const char *ioctl_name) | |||
| 500 | return ret; | 500 | return ret; |
| 501 | } | 501 | } |
| 502 | #else | 502 | #else |
| 503 | int bb_ioctl_or_warn(int fd, int request, void *argp) | 503 | int bb_ioctl_or_warn(int fd, unsigned request, void *argp) |
| 504 | { | 504 | { |
| 505 | int ret; | 505 | int ret; |
| 506 | 506 | ||
| @@ -509,7 +509,7 @@ int bb_ioctl_or_warn(int fd, int request, void *argp) | |||
| 509 | bb_perror_msg("ioctl %#x failed", request); | 509 | bb_perror_msg("ioctl %#x failed", request); |
| 510 | return ret; | 510 | return ret; |
| 511 | } | 511 | } |
| 512 | int bb_xioctl(int fd, int request, void *argp) | 512 | int bb_xioctl(int fd, unsigned request, void *argp) |
| 513 | { | 513 | { |
| 514 | int ret; | 514 | int ret; |
| 515 | 515 | ||