Mercurial > louis > mq > lightsd
changeset 250:a0066335c86e
final state before finishing fixes
| author | Louis Opter <kalessin@kalessin.fr> |
|---|---|
| date | Sat, 15 Aug 2015 16:36:28 -0700 |
| parents | 848fe96c58a5 |
| children | 0d981a9b602e |
| files | fix_command_pipe_read_loop.patch fix_ipv4_address_formatting.patch |
| diffstat | 2 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/fix_command_pipe_read_loop.patch Sat Aug 15 16:28:52 2015 -0700 +++ b/fix_command_pipe_read_loop.patch Sat Aug 15 16:36:28 2015 -0700 @@ -10,20 +10,6 @@ I wish conky wasn't fucked nowadays, that would have let me spot this earlier. -diff --git a/core/lightsd.h b/core/lightsd.h ---- a/core/lightsd.h -+++ b/core/lightsd.h -@@ -28,6 +28,10 @@ - .tv_sec = (v) / 1000, \ - .tv_usec = ((v) % 1000) * 1000 \ - } -+#define LGTD_SNPRINTF_APPEND(buf, i, bufsz, ...) do { \ -+ int n = snprintf(&(buf)[(i)], bufsz - i, __VA_ARGS__); \ -+ (i) = LGTD_MIN((i) + n, bufsz); \ -+} while (0) - - enum lgtd_verbosity { - LGTD_DEBUG = 0, diff --git a/core/pipe.c b/core/pipe.c --- a/core/pipe.c +++ b/core/pipe.c
--- a/fix_ipv4_address_formatting.patch Sat Aug 15 16:28:52 2015 -0700 +++ b/fix_ipv4_address_formatting.patch Sat Aug 15 16:36:28 2015 -0700 @@ -1,7 +1,21 @@ # HG changeset patch -# Parent 9a3306521fe5002bdaf61c06d6d74ae5abc3d38e +# Parent 118f1bcc0f067c493b1f5e112c02ac92fd922dc1 Fix IPv4 address formatting +diff --git a/core/lightsd.h b/core/lightsd.h +--- a/core/lightsd.h ++++ b/core/lightsd.h +@@ -28,6 +28,10 @@ + .tv_sec = (v) / 1000, \ + .tv_usec = ((v) % 1000) * 1000 \ + } ++#define LGTD_SNPRINTF_APPEND(buf, i, bufsz, ...) do { \ ++ int n = snprintf(&(buf)[(i)], bufsz - i, __VA_ARGS__); \ ++ (i) = LGTD_MIN((i) + n, bufsz); \ ++} while (0) + + enum lgtd_verbosity { + LGTD_DEBUG = 0, diff --git a/core/log.c b/core/log.c --- a/core/log.c +++ b/core/log.c @@ -13,7 +27,7 @@ #include <time.h> #if LGTD_HAVE_LIBBSD -@@ -93,12 +94,22 @@ +@@ -100,12 +101,22 @@ assert(buf); assert(buflen > 0);