Coding style consistency fix.

diff --git a/acceptor.cpp b/acceptor.cpp
index b5b4039899335714a5bdb47125be902aae95d706..593e4d4eb9cc207fce83730aee1c29e7a35519f2 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -67,7 +67,7 @@ int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type)
        return server_sock;
 }
 
-sockaddr_in6 CreateAnyAddress(int port)
+sockaddr_in6 create_any_address(int port)
 {
        sockaddr_in6 sin6;
        memset(&sin6, 0, sizeof(sin6));
@@ -76,7 +76,7 @@ sockaddr_in6 CreateAnyAddress(int port)
        return sin6;
 }
 
-sockaddr_in6 ExtractAddressFromAcceptorProto(const AcceptorProto &proto)
+sockaddr_in6 extract_address_from_acceptor_proto(const AcceptorProto &proto)
 {
        sockaddr_in6 sin6;
        memset(&sin6, 0, sizeof(sin6));
@@ -99,7 +99,7 @@ Acceptor::Acceptor(int server_sock, const sockaddr_in6 &addr)
 
 Acceptor::Acceptor(const AcceptorProto &serialized)
        : server_sock(serialized.server_sock()),
-         addr(ExtractAddressFromAcceptorProto(serialized))
+         addr(extract_address_from_acceptor_proto(serialized))
 {
 }
 

diff --git a/acceptor.h b/acceptor.h
index 199aea321284098fed2b97cd404b69ef3b506605..fe62c31396d119ea97addc6bdafae262fef8d452 100644 (file)
--- a/acceptor.h
+++ b/acceptor.h
@@ -13,8 +13,8 @@ int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type);
 
 class AcceptorProto;
 
-sockaddr_in6 CreateAnyAddress(int port);
-sockaddr_in6 ExtractAddressFromAcceptorProto(const AcceptorProto &proto);
+sockaddr_in6 create_any_address(int port);
+sockaddr_in6 extract_address_from_acceptor_proto(const AcceptorProto &proto);
 
 // A thread that accepts new connections on a given socket,
 // and hands them off to the server pool.

diff --git a/config.cpp b/config.cpp
index f474f8c495f2cd07c624bd87a9e7a0f4d58f3f6c..cf32c24ae81edb73187ccf883ca61f02648828b4 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -188,7 +188,7 @@ bool parse_port(const ConfigLine &line, Config *config)
        }
 
        AcceptorConfig acceptor;
-       acceptor.addr = CreateAnyAddress(port);
+       acceptor.addr = create_any_address(port);
 
        config->acceptors.push_back(acceptor);
        return true;

diff --git a/main.cpp b/main.cpp
index 14f6323ae01cf1ca821adbcf9a93bfed43ab304d..889b737fcbe3c08d3983e00677b37cc5aff8aa7d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -428,7 +428,7 @@ start:
 
                // Deserialize the acceptors.
                for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
-                       sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i));
+                       sockaddr_in6 sin6 = extract_address_from_acceptor_proto(loaded_state.acceptors(i));
                        deserialized_acceptors.insert(make_pair(
                                sin6,
                                new Acceptor(loaded_state.acceptors(i))));

diff --git a/udpinput.cpp b/udpinput.cpp
index 5e39d6632c9b72ca6916816283df44ffa8ef1820..001ef5f6d3db7a5fbf89ec279482b27241eb1a16 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -178,7 +178,7 @@ void UDPInput::do_work()
        while (!should_stop()) {
                if (sock == -1) {
                        int port_num = atoi(port.c_str());
-                       sockaddr_in6 addr = CreateAnyAddress(port_num);
+                       sockaddr_in6 addr = create_any_address(port_num);
                        sock = create_server_socket(addr, UDP_SOCKET);
                        if (sock == -1) {
                                log(WARNING, "[%s] UDP socket creation failed. Waiting 0.2 seconds and trying again...",