chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use /var/run/dbus/system_bus_socket for the D-Bus socket
[elogind.git]
/
src
/
shared
/
hwclock.c
diff --git
a/src/shared/hwclock.c
b/src/shared/hwclock.c
index 17f12de51fc6fdb6c652ceee3fac259270e7ed6c..7059d9c75b8367a0cb1d3b39983d74087cc54f6d 100644
(file)
--- a/
src/shared/hwclock.c
+++ b/
src/shared/hwclock.c
@@
-44,8
+44,7
@@
#include "fileio.h"
int hwclock_get_time(struct tm *tm) {
#include "fileio.h"
int hwclock_get_time(struct tm *tm) {
- int fd;
- int err = 0;
+ _cleanup_close_ int fd = -1;
assert(tm);
assert(tm);
@@
-56,20
+55,17
@@
int hwclock_get_time(struct tm *tm) {
/* This leaves the timezone fields of struct tm
* uninitialized! */
if (ioctl(fd, RTC_RD_TIME, tm) < 0)
/* This leaves the timezone fields of struct tm
* uninitialized! */
if (ioctl(fd, RTC_RD_TIME, tm) < 0)
-
err =
-errno;
+
return
-errno;
/* We don't know daylight saving, so we reset this in order not
/* We don't know daylight saving, so we reset this in order not
- * to confuse
d
mktime(). */
+ * to confuse mktime(). */
tm->tm_isdst = -1;
tm->tm_isdst = -1;
- close_nointr_nofail(fd);
-
- return err;
+ return 0;
}
int hwclock_set_time(const struct tm *tm) {
}
int hwclock_set_time(const struct tm *tm) {
- int fd;
- int err = 0;
+ _cleanup_close_ int fd = -1;
assert(tm);
assert(tm);
@@
-78,11
+74,9
@@
int hwclock_set_time(const struct tm *tm) {
return -errno;
if (ioctl(fd, RTC_SET_TIME, tm) < 0)
return -errno;
if (ioctl(fd, RTC_SET_TIME, tm) < 0)
- err = -errno;
-
- close_nointr_nofail(fd);
+ return -errno;
- return
err
;
+ return
0
;
}
int hwclock_is_localtime(void) {
}
int hwclock_is_localtime(void) {