Make naming of RTC config functions consistent

diff --git a/conf.c b/conf.c
index aa2aff55f9978f58021ecdee35881a2729deb9cf..fdd075178642b44b9349025be122cd9dd00e881a 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -1403,7 +1403,7 @@ CNF_AllowLocalReference(int *stratum)
 /* ================================================== */
 
 int
-CNF_GetRTCOnUTC(void)
+CNF_GetRtcOnUtc(void)
 {
   return rtc_on_utc;
 }
@@ -1411,7 +1411,7 @@ CNF_GetRTCOnUTC(void)
 /* ================================================== */
 
 int
-CNF_GetRTCSync(void)
+CNF_GetRtcSync(void)
 {
   return rtc_sync;
 }

diff --git a/conf.h b/conf.h
index 52491f9950105d0292f650230e94ba0d4dcae65d..4f6d623186fa247cb22de06633b92fe13c9959f0 100644 (file)
--- a/conf.h
+++ b/conf.h
@@ -60,8 +60,8 @@ extern int CNF_GetGenerateCommandKey(void);
 extern int CNF_GetDumpOnExit(void);
 extern int CNF_GetManualEnabled(void);
 extern int CNF_GetCommandPort(void);
-extern int CNF_GetRTCOnUTC(void);
-extern int CNF_GetRTCSync(void);
+extern int CNF_GetRtcOnUtc(void);
+extern int CNF_GetRtcSync(void);
 extern void CNF_GetMakeStep(int *limit, double *threshold);
 extern void CNF_GetMaxChange(int *delay, int *ignore, double *offset);
 extern void CNF_GetLogChange(int *enabled, double *threshold);

diff --git a/rtc.c b/rtc.c
index 9384afbcbae6dba9815a87564e8e7a52b2d96826..2557dd86d3db9fef52a891ddb7bd9b9179cc1cfb 100644 (file)
--- a/rtc.c
+++ b/rtc.c
@@ -84,7 +84,7 @@ RTC_Initialise(void)
   file_name = CNF_GetRtcFile();
 
   if (file_name) {
-    if (CNF_GetRTCSync()) {
+    if (CNF_GetRtcSync()) {
       LOG_FATAL(LOGF_Rtc, "rtcfile directive cannot be used with rtcsync");
     }
 

diff --git a/rtc_linux.c b/rtc_linux.c
index 4d2ffb371d77fb2b5f929ad66e08495f106c4439..d3b62f98070ecca4cd71cd55a2349be65d519425 100644 (file)
--- a/rtc_linux.c
+++ b/rtc_linux.c
@@ -374,7 +374,7 @@ t_from_rtc(struct tm *stm) {
 static void
 setup_config(void)
 {
-  if (CNF_GetRTCOnUTC()) {
+  if (CNF_GetRtcOnUtc()) {
     rtc_on_utc = 1;
   } else {
     rtc_on_utc = 0;

diff --git a/sys_linux.c b/sys_linux.c
index 80c888ed67b08484dae67aec5f9e61c68ea32c19..27c18fccb4d7d847b68a2f65bdc878f21c071985 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1115,7 +1115,7 @@ SYS_Linux_Initialise(void)
     have_setoffset = 0;
   }
 
-  TMX_SetSync(CNF_GetRTCSync());
+  TMX_SetSync(CNF_GetRtcSync());
 
   /* Read current kernel frequency */
   TMX_GetFrequency(&freq, &current_tick);