From 07569f8e011cd9b064c64bef1ce56f77bf7ddf53 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Mon, 28 Apr 2014 20:34:05 -0700
Subject: [PATCH 1/1] Coding style consistency fix.

---
 acceptor.cpp | 6 +++---
 acceptor.h   | 4 ++--
 config.cpp   | 2 +-
 main.cpp     | 2 +-
 udpinput.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acceptor.cpp b/acceptor.cpp
index b5b4039..593e4d4 100644
--- 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 199aea3..fe62c31 100644
--- 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 f474f8c..cf32c24 100644
--- 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 14f6323..889b737 100644
--- 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 5e39d66..001ef5f 100644
--- 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...",
-- 
2.39.2