Define USEC_PER_SEC, use "sec" and "usec" in comments.

diff --git a/utcp.c b/utcp.c
index 1627be77cbce59467e7aae4936cd4a730ff73ce7..f2354b1b8d181fd103edcfff3b7b4c7bbf44b9ec 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -49,7 +49,7 @@
        (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
        (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
        if((r)->tv_usec < 0)\
-               (r)->tv_sec--, (r)->tv_usec += 1000000;\
+               (r)->tv_sec--, (r)->tv_usec += USEC_PER_SEC;\
 } while (0)
 #endif
 
@@ -1434,8 +1434,8 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
        utcp->send = send;
        utcp->priv = priv;
        utcp->mtu = DEFAULT_MTU;
-       utcp->timeout = DEFAULT_USER_TIMEOUT; // s
-       utcp->rto = START_RTO; // us
+       utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
+       utcp->rto = START_RTO; // usec
 
        return utcp;
 }

diff --git a/utcp_priv.h b/utcp_priv.h
index 24f4158318ddccd8a4a586b72420fbe87de172c2..143ed60191746d36cc39b39ee5a27f7b8420ba7b 100644 (file)
--- a/utcp_priv.h
+++ b/utcp_priv.h
@@ -38,10 +38,11 @@
 
 #define DEFAULT_MTU 1000
 
-#define DEFAULT_USER_TIMEOUT 60 // s
-#define CLOCK_GRANULARITY 1000 // us
-#define START_RTO 1000000 // us
-#define MAX_RTO 3000000 // us
+#define USEC_PER_SEC 1000000
+#define DEFAULT_USER_TIMEOUT 60 // sec
+#define CLOCK_GRANULARITY 1000 // usec
+#define START_RTO 1000000 // usec
+#define MAX_RTO 3000000 // usec
 
 struct hdr {
        uint16_t src; // Source port
@@ -164,13 +165,13 @@ struct utcp {
        // Global socket options
 
        uint16_t mtu;
-       int timeout; // s
+       int timeout; // sec
 
        // RTT variables
 
-       uint32_t srtt; // us
-       uint32_t rttvar; // us
-       uint32_t rto; // us
+       uint32_t srtt; // usec
+       uint32_t rttvar; // usec
+       uint32_t rto; // usec
 
        // Connection management