Minor changes

* configure.ac: Version 1.2.92
* src/ctl.c (ctlio_finalize_reply): Don't close connection on errors.
* src/pies.h (PIES_PRINTFLIKE): New macro.
(logmsg, logmsg_printf): Mark as printflike.

3 files changed, 21 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index 1ee26ec..d1bb2a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNU Pies.  -*- autoconf -*-
-# Copyright (C) 2009-2015 Sergey Poznyakoff
+# Copyright (C) 2009-2016 Sergey Poznyakoff
 #
 # GNU Pies is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with GNU Pies.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.63])
-AC_INIT([GNU Pies], [1.2.91], [bug-pies@gnu.org.ua])
+AC_INIT([GNU Pies], [1.2.92], [bug-pies@gnu.org.ua])
 AC_CONFIG_SRCDIR([src/pies.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/ctl.c b/src/ctl.c
index 4f56923..f7e46d0 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -655,22 +655,14 @@ ctlio_finalize_reply (struct ctlio *io)
   char const *val;
   struct ctlbuf tmpbuf;
 
-  if (io->state & (CTL_INITIAL_STATE|CTL_AUTHENTICATED_STATE))
+  val = http_get_header (io->input.headers, "connection");
+  if (val)
     {
-      if (io->code / 100 == 2 || io->code == 401)
-        {
-          val = http_get_header (io->input.headers, "connection");
-          if (val)
-            {
-              if (strcasecmp (val, "keep-alive") == 0)
-                /* nothing */;
-              else if (strcasecmp (val, "close") == 0)
-                io->state = CTL_END_STATE;
-              //FIXME: else?
-            }
-        }
-      else
+      if (strcasecmp (val, "keep-alive") == 0)
+        /* nothing */;
+      else if (strcasecmp (val, "close") == 0)
         io->state = CTL_END_STATE;
+      //FIXME: else?
     }
       
   if (io->state == CTL_END_STATE || io->state == CTL_ACTION_STATE)
@@ -1184,7 +1176,7 @@ ctl_open ()
   if (listen (fd, 8))
     {
       logmsg (LOG_CRIT, "can't listen on control socket %s: %s",
-              strerror (errno));
+              control.url->string, strerror (errno));
       exit (EX_UNAVAILABLE);
     }
 
diff --git a/src/pies.h b/src/pies.h
index 4bc57bd..34f1250 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -419,20 +419,28 @@ extern int diag_output;
 
 void diag_setup (int flags);
 
-void logmsg (int prio, const char *fmt, ...);
-void logmsg_printf (int prio, const char *fmt, ...);
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(x)
+#endif
+
+#ifndef PIES_PRINTFLIKE
+# define PIES_PRINTFLIKE(fmt,narg) __attribute__ ((__format__ (__printf__, fmt, narg)))
+#endif
+
+void logmsg (int prio, const char *fmt, ...) PIES_PRINTFLIKE(2,3);
+void logmsg_printf (int prio, const char *fmt, ...) PIES_PRINTFLIKE(2,3);
 void logmsg_vprintf (int prio, const char *fmt, va_list ap);
 
 extern unsigned debug_level;
 extern int source_info_option;
-void debug_msg (const char *fmt, ...);
+void debug_msg (const char *fmt, ...) PIES_PRINTFLIKE(1,2);
 
 #define debug(lev, args)                                                \
   do                                                                    \
     if (debug_level >= lev)                                             \
       {                                                                 \
         if (source_info_option)                                         \
-          logmsg_printf (LOG_DEBUG, "%s:%lu:%s: ",                      \
+          logmsg_printf (LOG_DEBUG, "%s:%d:%s: ",                       \
                          __FILE__, __LINE__, __FUNCTION__);             \
         debug_msg args;                                                 \
       }                                                                 \