make do_output() void

It only ever returned 0 - making the return code fairly pointless.

Signed-off-by: Joern Engel <joern@logfs.org>

1 files changed, 5 insertions, 10 deletions

diff --git a/cancd.c b/cancd.c
index 720c699..cf99c7c 100644
--- a/cancd.c
+++ b/cancd.c
@@ -279,20 +279,19 @@ static int open_socket()
 	return 0;
 }
 
-/* Only return nonzero if fatal */
-static int do_output(const char *buf, int len, struct sockaddr_in *addr, socklen_t socklen)
+static void do_output(const char *buf, int len, struct sockaddr_in *addr, socklen_t socklen)
 {
 	int fd, rc, tot;
 	char *name, *tmp, *dir;
 
 	name = get_path(&addr->sin_addr);
 	if (!name)
-		return 0;
+		return;
 
 	tmp = strdup(name);
 	if (!tmp) {
 		syslog(LOG_ERR, "Unable to allocate memory while logging to \"%s\"", name);
-		return 0;
+		return;
 	}
 
 	dir = dirname(tmp);
@@ -300,7 +299,7 @@ static int do_output(const char *buf, int len, struct sockaddr_in *addr, socklen
 	free(tmp);
 
 	if (rc)
-		return 0;
+		return;
 
 	fd = open(name, O_WRONLY | O_APPEND | O_CREAT, 0600);
 	if (fd < 0)
@@ -320,8 +319,6 @@ static int do_output(const char *buf, int len, struct sockaddr_in *addr, socklen
 		close(fd);
 	}
 	free(name);
-
-	return 0;
 }
 
 static int set_blocking(int blocking)
@@ -412,9 +409,7 @@ static int run()
 			break;
 		}
 		/* For now, we process one at a time */
-		rc = do_output(buf, rc, &from, fromlen);
-		if (rc)		/* do_output() better not return error if nonfatal */
-			break;
+		do_output(buf, rc, &from, fromlen);
 	}
 	syslog(LOG_INFO, "Shutting down");