Revert "Increase compiler-warning level"

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index 38e4d6baa499a03536a5bfd95ac0c25bbc1dcbe1..86519578552d02236a0bcb802f3f6466f5b02425 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -100,7 +100,7 @@ static void print_timestamp(FILE *f)
        fprintf(f, "%s.%06ld: ", ts, tv.tv_usec);
 }
 
        fprintf(f, "%s.%06ld: ", ts, tv.tv_usec);
 }
 

-static void write_log(char *buf, int len, char *fmt, ...)
+static void write_log(const char *buf, int len, const char *fmt, ...)

 {
        va_list ap;
        int i;
 {
        va_list ap;
        int i;


@@ -116,12 +116,18 @@ static void write_log(char *buf, int len, char *fmt, ...)
        if (fmt) {
                if (logfile) {
                        va_start(ap, fmt);
        if (fmt) {
                if (logfile) {
                        va_start(ap, fmt);

+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"

                        vfprintf(logfile, fmt, ap);
                        vfprintf(logfile, fmt, ap);

+#pragma GCC diagnostic pop

                        va_end(ap);
                }
                if (verbose) {
                        va_start(ap, fmt);
                        va_end(ap);
                }
                if (verbose) {
                        va_start(ap, fmt);

+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"

                        vprintf(fmt, ap);
                        vprintf(fmt, ap);

+#pragma GCC diagnostic pop

                        va_end(ap);
                }
        }
                        va_end(ap);
                }
        }


@@ -142,12 +148,12 @@ static void write_log(char *buf, int len, char *fmt, ...)
                fflush(logfile);
 }
 
                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;
 {
        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);
 
        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) {
        uint8_t *inend = *inpos + inlen;
 
        if (flags & FLAG_LENGTH_BYTE) {

-               int len = 0;
+               size_t len = 0;

                uint8_t *ip;
 
                ip = *inpos;
                uint8_t *ip;
 
                ip = *inpos;


@@ -431,6 +437,7 @@ static int hmlan_parse_one(uint8_t *cmd, int last, void *data)
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);

+                       break;

                default:
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
                        break;
                default:
                        parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
                        break;


@@ -653,7 +660,7 @@ static int socket_server(char *iface, int port, int flags)
                                                exit(EXIT_FAILURE);
                                        }
 
                                                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);
                                                fclose(pidfile);
                                                fprintf(stderr, "Can't read old PID from " PID_FILE ", already running?\n");
                                                exit(EXIT_FAILURE);