net: cosmetic: Clean up SNTP variables and functions

Make a thorough pass through all variables and function names contained
within sntp.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/net/net.c b/net/net.c
index bd92806ba4427ec0b907de16c4a701951cd32751..fa0bf63e87789866ab47d8acad32982ee28af5d6 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -422,7 +422,7 @@ restart:
 #endif
 #if defined(CONFIG_CMD_SNTP)
                case SNTP:
-                       SntpStart();
+                       sntp_start();
                        break;
 #endif
 #if defined(CONFIG_CMD_DNS)

diff --git a/net/sntp.c b/net/sntp.c
index 1e2b67840f36b9ff828f9d02c280eab01ac7244d..8073ca69388ad8349c200b2e1a32cd450c459b78 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -14,10 +14,9 @@
 
 #define SNTP_TIMEOUT 10000UL
 
-static int SntpOurPort;
+static int sntp_our_port;
 
-static void
-SntpSend(void)
+static void sntp_send(void)
 {
        struct sntp_pkt_t pkt;
        int pktlen = SNTP_PACKET_LEN;
@@ -34,15 +33,14 @@ SntpSend(void)
        memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
               (char *)&pkt, pktlen);
 
-       SntpOurPort = 10000 + (get_timer(0) % 4096);
+       sntp_our_port = 10000 + (get_timer(0) % 4096);
        sport = NTP_SERVICE_PORT;
 
        net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport,
-                           SntpOurPort, pktlen);
+                           sntp_our_port, pktlen);
 }
 
-static void
-SntpTimeout(void)
+static void sntp_timeout_handler(void)
 {
        puts("Timeout\n");
        net_set_state(NETLOOP_FAIL);
@@ -58,7 +56,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 
        debug("%s\n", __func__);
 
-       if (dest != SntpOurPort)
+       if (dest != sntp_our_port)
                return;
 
        /*
@@ -72,20 +70,19 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
        rtc_set(&tm);
 #endif
        printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
-               tm.tm_year, tm.tm_mon, tm.tm_mday,
-               tm.tm_hour, tm.tm_min, tm.tm_sec);
+              tm.tm_year, tm.tm_mon, tm.tm_mday,
+              tm.tm_hour, tm.tm_min, tm.tm_sec);
 
        net_set_state(NETLOOP_SUCCESS);
 }
 
-void
-SntpStart(void)
+void sntp_start(void)
 {
        debug("%s\n", __func__);
 
-       NetSetTimeout(SNTP_TIMEOUT, SntpTimeout);
+       NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler);
        net_set_udp_handler(sntp_handler);
        memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
 
-       SntpSend();
+       sntp_send();
 }

diff --git a/net/sntp.h b/net/sntp.h
index bf5bf0bb01d6dae7392608d38d46227c00b7e64b..6a9c6bb82fb9bbfe2235a232b29569ce2b85c113 100644 (file)
--- a/net/sntp.h
+++ b/net/sntp.h
@@ -53,6 +53,6 @@ struct sntp_pkt_t {
        unsigned long long transmit_timestamp;
 };
 
-extern void SntpStart(void);   /* Begin SNTP */
+void sntp_start(void); /* Begin SNTP */
 
 #endif /* __SNTP_H__ */