Merge branch 'collectd-5.7'

diff --cc README
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/target_set.c
Simple merge

diff --cc src/utils_cmd_getthreshold.c
index 491d7765ee82d9ce20e3c4d661aa457eeadf1540,926375d63a1db2a79e73a50b486548cbe12eb0a8..063548b7777ea2430ade32b4b1e25e20d7a7e64a
--- 1/src/utils_cmd_getthreshold.c
--- 2/src/utils_cmd_getthreshold.c
+++ b/src/utils_cmd_getthreshold.c
@@@ -155,46 -155,31 +155,29 @@@ int handle_getthreshold(FILE *fh, char 
    print_to_socket(fh, "%zu Threshold found\n", i);
  
    if (threshold.host[0] != 0)
-     print_to_socket(fh, "Host: %s\n", threshold.host) if (
-         threshold.plugin[0] !=
-         0) print_to_socket(fh, "Plugin: %s\n",
-                            threshold.plugin) if (threshold.plugin_instance[0] !=
-                                                  0)
-         print_to_socket(fh, "Plugin Instance: %s\n",
-                         threshold.plugin_instance) if (threshold.type[0] != 0)
-             print_to_socket(fh, "Type: %s\n", threshold.type) if (
-                 threshold.type_instance[0] !=
-                 0) print_to_socket(fh, "Type Instance: %s\n",
-                                    threshold
-                                        .type_instance) if (threshold.data_source
-                                                                [0] != 0)
-                 print_to_socket(
-                     fh, "Data Source: %s\n",
-                     threshold.data_source) if (!isnan(threshold.warning_min))
-                     print_to_socket(
-                         fh, "Warning Min: %g\n",
-                         threshold
-                             .warning_min) if (!isnan(threshold.warning_max))
-                         print_to_socket(
-                             fh, "Warning Max: %g\n",
-                             threshold
-                                 .warning_max) if (!isnan(threshold.failure_min))
-                             print_to_socket(
-                                 fh, "Failure Min: %g\n",
-                                 threshold
-                                     .failure_min) if (!isnan(threshold
-                                                                  .failure_max))
-                                 print_to_socket(
-                                     fh, "Failure Max: %g\n",
-                                     threshold.failure_max) if (threshold
-                                                                    .hysteresis >
-                                                                0.0)
-                                     print_to_socket(
-                                         fh, "Hysteresis: %g\n",
-                                         threshold.hysteresis) if (threshold
-                                                                       .hits > 1)
-                                         print_to_socket(fh, "Hits: %i\n",
-                                                         threshold.hits)
- 
-                                             return (0);
+     print_to_socket(fh, "Host: %s\n", threshold.host);
+   if (threshold.plugin[0] != 0)
+     print_to_socket(fh, "Plugin: %s\n", threshold.plugin);
+   if (threshold.plugin_instance[0] != 0)
+     print_to_socket(fh, "Plugin Instance: %s\n", threshold.plugin_instance);
+   if (threshold.type[0] != 0)
+     print_to_socket(fh, "Type: %s\n", threshold.type);
+   if (threshold.type_instance[0] != 0)
+     print_to_socket(fh, "Type Instance: %s\n", threshold.type_instance);
+   if (threshold.data_source[0] != 0)
+     print_to_socket(fh, "Data Source: %s\n", threshold.data_source);
+   if (!isnan(threshold.warning_min))
+     print_to_socket(fh, "Warning Min: %g\n", threshold.warning_min);
+   if (!isnan(threshold.warning_max))
+     print_to_socket(fh, "Warning Max: %g\n", threshold.warning_max);
+   if (!isnan(threshold.failure_min))
+     print_to_socket(fh, "Failure Min: %g\n", threshold.failure_min);
+   if (!isnan(threshold.failure_max))
+     print_to_socket(fh, "Failure Max: %g\n", threshold.failure_max);
+   if (threshold.hysteresis > 0.0)
+     print_to_socket(fh, "Hysteresis: %g\n", threshold.hysteresis);
+   if (threshold.hits > 1)
+     print_to_socket(fh, "Hits: %i\n", threshold.hits);
+ 
+   return (0);
  } /* int handle_getthreshold */
 -
 -/* vim: set sw=2 sts=2 ts=8 et : */

diff --cc src/write_prometheus.c
Simple merge