minor cleanups

- avoid use of non-const fmt string
- avoid duplicate def of sbuf_len

diff --git a/include/bouncer.h b/include/bouncer.h
index 87a5a6ce8851b71e67bf2fa674b6286513406951..d4a8c90d68e01dffb28c0324bdcf369c303411f2 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -66,6 +66,8 @@ typedef struct PgAddr PgAddr;
 typedef enum SocketState SocketState;
 typedef struct PktHdr PktHdr;
 
+extern int cf_sbuf_len;
+
 #include "aatree.h"
 #include "hash.h"
 #include "util.h"
@@ -346,7 +348,6 @@ extern int cf_shutdown;
 extern int cf_reboot;
 
 extern int cf_sbuf_loopcnt;
-extern int cf_sbuf_len;
 extern int cf_tcp_keepalive;
 extern int cf_tcp_keepcnt;
 extern int cf_tcp_keepidle;

diff --git a/include/iobuf.h b/include/iobuf.h
index 04424adf4ee29e1670c6d0f5971df4ebd3f3627f..7a62217b98d5dd61ffd538f9ce996c346f440710 100644 (file)
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -39,8 +39,6 @@
  *     send_pending();
  */    
 
-extern int cf_sbuf_len;
-
 /*
  * 0 .. done_pos         -- sent
  * done_pos .. parse_pos -- parsed, to send

diff --git a/src/main.c b/src/main.c
index 94721762ff2dca7bacb7bc6c5891c6eb8d93833d..7bb15ce4f813bf96ec3094f0b669f304530b1bc3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -534,10 +534,10 @@ static void write_pidfile(void)
 
        fd = open(cf_pidfile, O_WRONLY | O_CREAT | O_EXCL, 0644);
        if (fd < 0)
-               fatal_perror(cf_pidfile);
+               fatal_perror("%s", cf_pidfile);
        res = safe_write(fd, buf, strlen(buf));
        if (res < 0)
-               fatal_perror(cf_pidfile);
+               fatal_perror("%s", cf_pidfile);
        close(fd);
 
        /* only remove when we have it actually written */