Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / src / daemon / utils_complain.c

diff --git a/src/daemon/utils_complain.c b/src/daemon/utils_complain.c
index d028c06..d2162ba 100644 (file)
--- a/src/daemon/utils_complain.c
+++ b/src/daemon/utils_complain.c
@@ -28,78 +28,72 @@
 
 #include "collectd.h"
 
-#include "utils_complain.h"
 #include "plugin.h"
+#include "utils_complain.h"
 
 /* vcomplain returns 0 if it did not report, 1 else */
-static int vcomplain (int level, c_complain_t *c,
-               const char *format, va_list ap)
-{
-       cdtime_t now;
-       char   message[512];
+__attribute__((format(printf, 3, 0))) static int
+vcomplain(int level, c_complain_t *c, const char *format, va_list ap) {
+  cdtime_t now;
+  char message[512];
 
-       now = cdtime ();
+  now = cdtime();
 
-       if (c->last + c->interval > now)
-               return 0;
+  if (c->last + c->interval > now)
+    return 0;
 
-       c->last = now;
+  c->last = now;
 
-       if (c->interval < plugin_get_interval ())
-               c->interval = plugin_get_interval ();
-       else
-               c->interval *= 2;
+  if (c->interval < plugin_get_interval())
+    c->interval = plugin_get_interval();
+  else
+    c->interval *= 2;
 
-       if (c->interval > TIME_T_TO_CDTIME_T (86400))
-               c->interval = TIME_T_TO_CDTIME_T (86400);
+  if (c->interval > TIME_T_TO_CDTIME_T(86400))
+    c->interval = TIME_T_TO_CDTIME_T(86400);
 
-       vsnprintf (message, sizeof (message), format, ap);
-       message[sizeof (message) - 1] = '\0';
+  vsnprintf(message, sizeof(message), format, ap);
+  message[sizeof(message) - 1] = '\0';
 
-       plugin_log (level, "%s", message);
-       return 1;
+  plugin_log(level, "%s", message);
+  return 1;
 } /* vcomplain */
 
-void c_complain (int level, c_complain_t *c, const char *format, ...)
-{
-       va_list ap;
+void c_complain(int level, c_complain_t *c, const char *format, ...) {
+  va_list ap;
 
-       va_start (ap, format);
-       if (vcomplain (level, c, format, ap))
-               c->complained_once = 1;
-       va_end (ap);
+  va_start(ap, format);
+  if (vcomplain(level, c, format, ap))
+    c->complained_once = 1;
+  va_end(ap);
 } /* c_complain */
 
-void c_complain_once (int level, c_complain_t *c, const char *format, ...)
-{
-       va_list ap;
+void c_complain_once(int level, c_complain_t *c, const char *format, ...) {
+  va_list ap;
 
-       if (c->complained_once)
-               return;
+  if (c->complained_once)
+    return;
 
-       va_start (ap, format);
-       if (vcomplain (level, c, format, ap))
-               c->complained_once = 1;
-       va_end (ap);
+  va_start(ap, format);
+  if (vcomplain(level, c, format, ap))
+    c->complained_once = 1;
+  va_end(ap);
 } /* c_complain_once */
 
-void c_do_release (int level, c_complain_t *c, const char *format, ...)
-{
-       char message[512];
-       va_list ap;
+void c_do_release(int level, c_complain_t *c, const char *format, ...) {
+  char message[512];
+  va_list ap;
 
-       if (c->interval == 0)
-               return;
+  if (c->interval == 0)
+    return;
 
-       c->interval = 0;
-       c->complained_once = 0;
+  c->interval = 0;
+  c->complained_once = 0;
 
-       va_start (ap, format);
-       vsnprintf (message, sizeof (message), format, ap);
-       message[sizeof (message) - 1] = '\0';
-       va_end (ap);
+  va_start(ap, format);
+  vsnprintf(message, sizeof(message), format, ap);
+  message[sizeof(message) - 1] = '\0';
+  va_end(ap);
 
-       plugin_log (level, "%s", message);
+  plugin_log(level, "%s", message);
 } /* c_release */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */