shared: rename hwclock.[ch] to clock-util.[ch]

[elogind.git] / src / core / main.c

diff --git a/src/core/main.c b/src/core/main.c
index 74c50f51bea5a0ec22852c75a7daa602dfe9f136..77cc2fbbdd93d9b253f575c3aa80ba8ce4a1be94 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -61,7 +61,7 @@
 #include "capability.h"
 #include "killall.h"
 #include "env-util.h"
 #include "capability.h"
 #include "killall.h"
 #include "env-util.h"

-#include "hwclock.h"
+#include "clock-util.h"

 #include "fileio.h"
 #include "dbus-manager.h"
 #include "bus-error.h"
 #include "fileio.h"
 #include "dbus-manager.h"
 #include "bus-error.h"


@@ -1352,11 +1352,11 @@ int main(int argc, char *argv[]) {
                         goto finish;
 
                 if (!skip_setup) {
                         goto finish;
 
                 if (!skip_setup) {

-                        if (hwclock_is_localtime() > 0) {
+                        if (clock_is_localtime() > 0) {

                                 int min;
 
                                 /* The first-time call to settimeofday() does a time warp in the kernel */
                                 int min;
 
                                 /* The first-time call to settimeofday() does a time warp in the kernel */

-                                r = hwclock_set_timezone(&min);
+                                r = clock_set_timezone(&min);

                                 if (r < 0)
                                         log_error("Failed to apply local time delta, ignoring: %s", strerror(-r));
                                 else
                                 if (r < 0)
                                         log_error("Failed to apply local time delta, ignoring: %s", strerror(-r));
                                 else


@@ -1370,10 +1370,10 @@ int main(int argc, char *argv[]) {
                                  * that way. In such case, we need to delay the time-warp or the sealing
                                  * until we reach the real system.
                                  */
                                  * that way. In such case, we need to delay the time-warp or the sealing
                                  * until we reach the real system.
                                  */

-                                hwclock_reset_timezone();
+                                clock_reset_timezone();

 
                                 /* Tell the kernel our timezone */
 
                                 /* Tell the kernel our timezone */

-                                r = hwclock_set_timezone(NULL);
+                                r = clock_set_timezone(NULL);

                                 if (r < 0)
                                         log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r));
                         }
                                 if (r < 0)
                                         log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r));
                         }