diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-01-03 15:20:09 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-01-03 15:20:09 +0200 |
commit | 85f2fd8d2772506911e95c3e4a0cb2538594b274 (patch) | |
tree | d486caebbec25a05024fcd9bfbf99efa6832c2a2 /src | |
parent | 6db017a32e379bb2eb7878771dea969f77c3168c (diff) | |
download | pies-85f2fd8d2772506911e95c3e4a0cb2538594b274.tar.gz pies-85f2fd8d2772506911e95c3e4a0cb2538594b274.tar.bz2 |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/ctl.c | 10 | ||||
-rw-r--r-- | src/pies.h | 16 |
2 files changed, 13 insertions, 13 deletions
@@ -655,10 +655,6 @@ ctlio_finalize_reply (struct ctlio *io) char const *val; struct ctlbuf tmpbuf; - if (io->state & (CTL_INITIAL_STATE|CTL_AUTHENTICATED_STATE)) - { - if (io->code / 100 == 2 || io->code == 401) - { val = http_get_header (io->input.headers, "connection"); if (val) { @@ -668,10 +664,6 @@ ctlio_finalize_reply (struct ctlio *io) io->state = CTL_END_STATE; //FIXME: else? } - } - else - io->state = CTL_END_STATE; - } if (io->state == CTL_END_STATE || io->state == CTL_ACTION_STATE) output_set_header (&io->output, "Connection", "close"); @@ -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); } @@ -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; \ } \ |