diff options
Diffstat (limited to 'miscutils/hdparm.c')
| -rw-r--r-- | miscutils/hdparm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 342e240..b453efb 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -810,7 +810,7 @@ static void identify(uint16_t *val) like_std = 3; } else /* "Unknown device type:\n\tbits 15&14 of general configuration word 0 both set to 1.\n" */ - bb_error_msg_and_die("unknown device type"); + bb_simple_error_msg_and_die("unknown device type"); printf("%sremovable media\n", !(val[GEN_CONFIG] & MEDIA_REMOVABLE) ? "non-" : ""); /* Info from the specific configuration word says whether or not the @@ -1440,7 +1440,7 @@ static void flush_buffer_cache(/*int fd*/ void) sleep(1); if (ioctl(fd, HDIO_DRIVE_CMD, NULL) && errno != EINVAL) { /* await completion */ if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ - bb_perror_msg("HDIO_DRIVE_CMD"); + bb_simple_perror_msg("HDIO_DRIVE_CMD"); else bb_perror_msg("ioctl %#x failed", HDIO_DRIVE_CMD); } @@ -1506,7 +1506,7 @@ static void do_time(int cache /*,int fd*/) char *buf = xmalloc(TIMING_BUF_BYTES); if (mlock(buf, TIMING_BUF_BYTES)) - bb_perror_msg_and_die("mlock"); + bb_simple_perror_msg_and_die("mlock"); /* Clear out the device request queues & give them time to complete. * NB: *small* delay. User is expected to have a clue and to not run @@ -1857,7 +1857,7 @@ static void process_dev(char *devname) char buf[512]; flush_buffer_cache(); if (-1 == read(fd, buf, sizeof(buf))) - bb_perror_msg("read of 512 bytes failed"); + bb_simple_perror_msg("read of 512 bytes failed"); } #endif /* HDIO_DRIVE_CMD */ if (getset_mult || get_identity) { @@ -1865,7 +1865,7 @@ static void process_dev(char *devname) if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) { /* To be coherent with ioctl_or_warn. */ if (getset_mult && ENABLE_IOCTL_HEX2STR_ERROR) - bb_perror_msg("HDIO_GET_MULTCOUNT"); + bb_simple_perror_msg("HDIO_GET_MULTCOUNT"); else bb_perror_msg("ioctl %#x failed", HDIO_GET_MULTCOUNT); } else if (getset_mult) { @@ -1985,7 +1985,7 @@ static void process_dev(char *devname) } else if (errno == -ENOMSG) puts(" no identification info available"); else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ - bb_perror_msg("HDIO_GET_IDENTITY"); + bb_simple_perror_msg("HDIO_GET_IDENTITY"); else bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); } |