summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ William Piggott2017-07-24 20:59:07 +0200
committerJ William Piggott2017-07-31 22:10:47 +0200
commitb3e8105837505fc9b4637b4e41cca39eecb48ebf (patch)
tree197f1e1ad7d8dc44609589bc673596d92656a758
parenthwclock: remove custom errno string (diff)
downloadkernel-qcow2-util-linux-b3e8105837505fc9b4637b4e41cca39eecb48ebf.tar.gz
kernel-qcow2-util-linux-b3e8105837505fc9b4637b4e41cca39eecb48ebf.tar.xz
kernel-qcow2-util-linux-b3e8105837505fc9b4637b4e41cca39eecb48ebf.zip
hwclock: remove custom errno string
Custom errno messages are unnecessary and problematic for translators. hwclock --directisa hwclock: iopl() port access failed: Operation not permitted hwclock: root privileges may be required The custom errno message is misleading. We do not know what the system permissions are set to. The default errno string is correct, and enough. Patched: hwclock --directisa hwclock: iopl() port access failed: Operation not permitted root@:~# hwclock --directisa -D Using direct ISA access to the clock 2017-07-24 14:49:17.782716-0400 Signed-off-by: J William Piggott <elseifthen@gmx.com>
-rw-r--r--sys-utils/hwclock-cmos.c6
-rw-r--r--sys-utils/hwclock.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c
index 6227b94c0..cdbc88b03 100644
--- a/sys-utils/hwclock-cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -45,7 +45,6 @@
* tm_isdst >0: yes, 0: no, <0: unknown
*/
-#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
@@ -390,12 +389,9 @@ static int get_permissions_cmos(void)
if (rc == IOPL_NOT_IMPLEMENTED) {
warnx(_("ISA port access is not implemented"));
} else if (rc != 0) {
- rc = errno;
warn(_("iopl() port access failed"));
- if (rc == EPERM && geteuid())
- warnx(_("root privileges may be required"));
}
- return rc ? 1 : 0;
+ return rc;
}
static struct clock_ops cmos_interface = {
diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h
index a1ef80cee..8843501f3 100644
--- a/sys-utils/hwclock.h
+++ b/sys-utils/hwclock.h
@@ -1,7 +1,6 @@
#ifndef HWCLOCK_CLOCK_H
#define HWCLOCK_CLOCK_H
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>