projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb5f5ae
)
Minor code cleanup
author
Felix Morgner
<felix.morgner@gmail.com>
Fri, 16 May 2014 14:02:55 +0000
(16:02 +0200)
committer
Felix Morgner
<felix.morgner@gmail.com>
Fri, 16 May 2014 14:02:55 +0000
(16:02 +0200)
src/server.c
patch
|
blob
|
history
diff --git
a/src/server.c
b/src/server.c
index fd0c9653566c06301c5159745858276277920067..5d67e8f873a1927387c966805760ab33b31881f6 100644
(file)
--- a/
src/server.c
+++ b/
src/server.c
@@
-83,7
+83,6
@@
struct sockaddr_storage** Server_setupAddressesAndPorts()
int error = 0;
int error = 0;
- const char* confadd = getStrConf(BINDADDR);
error = inet_pton(AF_INET, (!bindaddr) ? ((getStrConf(BINDADDR)) ? getStrConf(BINDADDR) : "0.0.0.0")
: bindaddr, &(((struct sockaddr_in*)v4address)->sin_addr));
if (error == 0) Log_fatal("Invalid IPv4 address supplied!");
error = inet_pton(AF_INET, (!bindaddr) ? ((getStrConf(BINDADDR)) ? getStrConf(BINDADDR) : "0.0.0.0")
: bindaddr, &(((struct sockaddr_in*)v4address)->sin_addr));
if (error == 0) Log_fatal("Invalid IPv4 address supplied!");
@@
-172,7
+171,6
@@
void Server_runLoop(struct pollfd* pollfds)
void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
uint8_t yes = 1;
void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
uint8_t yes = 1;
- int error = 0;
int sockets[2];
/* IPv4 socket setup */
int sockets[2];
/* IPv4 socket setup */
@@
-211,7
+209,6
@@
void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd
void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
int val = 0;
void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
int val = 0;
- int error = 0;
int sockets[2];
if((udpsocks = malloc(2 * sizeof(int))) == NULL)
int sockets[2];
if((udpsocks = malloc(2 * sizeof(int))) == NULL)