Rename function for consistency

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 3132e6c6d7839bfa45151fdd15af57a9567e7477..f1122bddabbc44333961736a8480fcffb4dfb853 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -313,7 +313,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
        syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
 
-       uint64_t start = adhc6c_get_milli_time(), round_start = start, elapsed;
+       uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
        // Generate transaction ID
        uint8_t trid[3];
@@ -344,7 +344,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
                // Receive rounds
                for (; len < 0 && round_start < round_end;
-                               round_start = adhc6c_get_milli_time()) {
+                               round_start = odhcp6c_get_milli_time()) {
                        // Check for pending signal
                        if (odhcp6c_signal_is_pending())
                                return -1;
@@ -365,7 +365,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
                                uint8_t *opt = &buf[4];
                                uint8_t *opt_end = opt + len - 4;
 
-                               round_start = adhc6c_get_milli_time();
+                               round_start = odhcp6c_get_milli_time();
                                elapsed = round_start - start;
                                syslog(LOG_NOTICE, "Got a valid reply after "
                                                "%ums", (unsigned)elapsed);

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 2cb4bbcf10a200797e2268bae6120aeb250a2928..0825610a2a61f87d6f3c11935d118b983be7a4f6 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -302,7 +302,7 @@ static int usage(void)
 
 
 // Don't want to pull-in librt and libpthread just for a monotonic clock...
-uint64_t adhc6c_get_milli_time(void)
+uint64_t odhcp6c_get_milli_time(void)
 {
        struct timespec t = {0, 0};
        syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 8ab938e94c9aba78c41fdf2c010a8bb4ec340289..2d4fa9065811a7809c7fee188e2f02f453068eca 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -192,7 +192,7 @@ void script_call(const char *status);
 
 // State manipulation
 bool odhcp6c_signal_is_pending(void);
-uint64_t adhc6c_get_milli_time(void);
+uint64_t odhcp6c_get_milli_time(void);
 void odhcp6c_clear_state(enum odhcp6c_state state);
 void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len);
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len);