faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtc: cleanup in error messages

Browse source
This commit is contained in:
Miroslav Lichvar 2014-08-18 11:03:15 +02:00
parent d0fb17d70c
commit c52e9085d1
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rtc.c
View file

@ -77,7 +77,8 @@ void
RTC_Initialise(void) RTC_Initialise(void)
{ {
char *file_name; char *file_name;
int ok;
driver_initialised = 0;
/* This is how we tell whether the user wants to load the RTC /* This is how we tell whether the user wants to load the RTC
driver, if he is on a machine where it is an option. */ driver, if he is on a machine where it is an option. */
@ -90,23 +91,11 @@ RTC_Initialise(void)
if (driver.init) { if (driver.init) {
if ((driver.init)()) { if ((driver.init)()) {
ok = 1; driver_initialised = 1;
} else {
ok = 0;
} }
} else { } else {
ok = 0; LOG(LOGS_ERR, LOGF_Rtc, "RTC not supported on this operating system");
} }
if (ok) {
driver_initialised = 1;
} else {
driver_initialised = 0;
LOG(LOGS_ERR, LOGF_Rtc, "Real time clock not supported on this operating system");
}
} else {
driver_initialised = 0;
} }
} }
@ -137,7 +126,6 @@ RTC_TimeInit(void (*after_hook)(void *), void *anything)
if (driver_initialised) { if (driver_initialised) {
(driver.time_init)(after_hook, anything); (driver.time_init)(after_hook, anything);
} else { } else {
LOG(LOGS_ERR, LOGF_Rtc, "Can't initialise from real time clock, driver not loaded");
(after_hook)(anything); (after_hook)(anything);
} }
} }

6
rtc_linux.c
View file

@ -456,9 +456,6 @@ read_coefs_from_file(void)
coefs_file_name); coefs_file_name);
} }
fclose(in); fclose(in);
} else {
LOG(LOGS_WARN, LOGF_RtcLinux, "Could not open RTC file %s for reading",
coefs_file_name);
} }
} }
} }
@ -550,7 +547,8 @@ RTC_Linux_Initialise(void)
fd = open (CNF_GetRtcDevice(), O_RDWR); fd = open (CNF_GetRtcDevice(), O_RDWR);
if (fd < 0) { if (fd < 0) {
LOG(LOGS_ERR, LOGF_RtcLinux, "Could not open %s, %s", CNF_GetRtcDevice(), strerror(errno)); LOG(LOGS_ERR, LOGF_RtcLinux, "Could not open RTC device %s : %s",
CNF_GetRtcDevice(), strerror(errno));
return 0; return 0;
} }