X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/ee8d07d894fa10e47b4441a4db473496c701cb0f..2f47f304d1ffbed3869066b0cb335b7bf32a9e8d:/hmland.c

diff --git a/hmland.c b/hmland.c
index 210893d..8651957 100644
--- a/hmland.c
+++ b/hmland.c
@@ -116,12 +116,18 @@ static void write_log(const char *buf, int len, const char *fmt, ...)
 	if (fmt) {
 		if (logfile) {
 			va_start(ap, fmt);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 			vfprintf(logfile, fmt, ap);
+#pragma GCC diagnostic pop
 			va_end(ap);
 		}
 		if (verbose) {
 			va_start(ap, fmt);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 			vprintf(fmt, ap);
+#pragma GCC diagnostic pop
 			va_end(ap);
 		}
 	}
@@ -142,12 +148,12 @@ static void write_log(const char *buf, int len, const char *fmt, ...)
 		fflush(logfile);
 }
 
-static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int len, int flags)
+static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, size_t len, int flags)
 {
 	uint8_t *buf_out = *outpos;
 	uint8_t *outend = *outpos + outlen;
 	uint8_t *inend = *inpos + inlen;
-	int i;
+	size_t i;
 
 	if (flags & FLAG_COMMA_BEFORE) {
 		CHECK_SPACE(1);
@@ -202,7 +208,7 @@ static int parse_part_in(uint8_t **inpos, int inlen, uint8_t **outpos, int outle
 	uint8_t *inend = *inpos + inlen;
 
 	if (flags & FLAG_LENGTH_BYTE) {
-		int len = 0;
+		size_t len = 0;
 		uint8_t *ip;
 
 		ip = *inpos;
@@ -654,7 +660,7 @@ static int socket_server(char *iface, int port, int flags)
 						exit(EXIT_FAILURE);
 					}
 
-					if (fscanf(pidfile, "%u", &old_pid) != 1) {
+					if (fscanf(pidfile, "%d", &old_pid) != 1) {
 						fclose(pidfile);
 						fprintf(stderr, "Can't read old PID from " PID_FILE ", already running?\n");
 						exit(EXIT_FAILURE);