summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-03-12 11:16:36 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-03-12 11:16:36 +0100
commit4e707e7a5fc1507c360bc174ef3decadba6bfa9b (patch)
tree09924efee7ec2e9c32ed8375c153d6e4f4f033a9
parent5892da74df3ab49b23066465fef286c451eed389 (diff)
downloadecon-4e707e7a5fc1507c360bc174ef3decadba6bfa9b.tar.gz
econ-4e707e7a5fc1507c360bc174ef3decadba6bfa9b.tar.bz2
econ-4e707e7a5fc1507c360bc174ef3decadba6bfa9b.zip
Use perror where possible
-rw-r--r--econserv.c5
-rw-r--r--util.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/econserv.c b/econserv.c
index 89d3ea9..f3f990e 100644
--- a/econserv.c
+++ b/econserv.c
@@ -27,7 +27,6 @@
#include <stddef.h>
#include <stdint.h>
#include <assert.h>
-#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -212,7 +211,7 @@ handle_input(struct ecs *ecs, char *in, int fd,
in.sin_addr.s_addr = ((struct sockaddr_in *) src_addr)->sin_addr.s_addr;
printf("got connect request\n");
if (connect(ecs->client_fd, (struct sockaddr *) &in, sizeof in) != 0) {
- fprintf(stderr, "failed to connect: %s\n", strerror(errno));
+ perror("Failed to connect");
close(ecs->client_fd);
ecs->client_fd = -1;
ecs->state = E_PSTAT_NOUSE;
@@ -347,7 +346,7 @@ int main(int argc, char *argv[])
}
if (select(maxfd + 1, &fds, NULL, NULL, NULL) <= 0) {
- fprintf(stderr, "select failed: %s", strerror(errno));
+ perror("Select failed");
continue;
}
diff --git a/util.c b/util.c
index 4df5080..ab04d08 100644
--- a/util.c
+++ b/util.c
@@ -59,8 +59,7 @@ sock_get_ifreq(int fd)
ifconf.ifc_len = sizeof ifreqs;
ifconf.ifc_req = ifreqs;
if (ioctl(fd, SIOCGIFCONF, &ifconf) < 0) {
- fprintf(stderr, "retrieving interfaces failed: %s\n",
- strerror(errno));
+ perror("Reading interface configuration failed");
return NULL;
}
@@ -203,8 +202,7 @@ connect_to_host(int socktype, const char *host, const char *port)
int broadcast_enable = 1;
if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST,
&broadcast_enable, sizeof(broadcast_enable)) < 0)
- fprintf(stderr, "Failed to setsockopt broadcast: %s\n",
- strerror(errno));
+ perror("Failed to setsockopt broadcast");
}
if (connect(fd, rp->ai_addr, rp->ai_addrlen) != -1)
@@ -214,7 +212,7 @@ connect_to_host(int socktype, const char *host, const char *port)
}
freeaddrinfo(result);
if (rp == NULL) {
- fprintf(stderr, "Failed to connect: %s\n", strerror(errno));
+ perror("Failed to connect");
return -1;
}