X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flvm.c;h=3077c93cc5ee4ff185efb1369bce647fcf117257;hb=29c792a5039aeaa9d92f063c3ae2a66c3e9b1626;hp=4bb1c3409ea25f9145d0c5148b9052568f5a3429;hpb=6f30c750cc555fb016db827cd5ff6e1e1c2cc87e;p=collectd.git

diff --git a/src/lvm.c b/src/lvm.c
index 4bb1c340..3077c93c 100644
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <lvm2app.h>
 
@@ -81,7 +81,8 @@ static void report_lv_utilization(lv_t lv, char const *vg_name,
     return;
   used_bytes = lv_size * (used_percent_unscaled * PERCENT_SCALE_FACTOR);
 
-  snprintf(plugin_instance, sizeof(plugin_instance), "%s-%s", vg_name, lv_name);
+  ssnprintf(plugin_instance, sizeof(plugin_instance), "%s-%s", vg_name,
+            lv_name);
   lvm_submit(plugin_instance, "used", used_bytes);
   lvm_submit(plugin_instance, "free", lv_size - used_bytes);
 }
@@ -187,16 +188,16 @@ static int lvm_read(void) {
   return 0;
 } /*lvm_read */
 
-static int lvm_init(void) {
+static int c_lvm_init(void) {
 #if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_SYS_ADMIN)
   if (check_capability(CAP_SYS_ADMIN) != 0) {
     if (getuid() == 0)
-      WARNING("smart plugin: Running collectd as root, but the "
+      WARNING("lvm plugin: Running collectd as root, but the "
               "CAP_SYS_ADMIN capability is missing. The plugin's read "
               "function will probably fail. Is your init system dropping "
               "capabilities?");
     else
-      WARNING("smart plugin: collectd doesn't have the CAP_SYS_ADMIN "
+      WARNING("lvm plugin: collectd doesn't have the CAP_SYS_ADMIN "
               "capability. If you don't want to run collectd as root, try "
               "running \"setcap cap_sys_admin=ep\" on the collectd binary.");
   }
@@ -205,6 +206,6 @@ static int lvm_init(void) {
 }
 
 void module_register(void) {
-  plugin_register_init("lvm", lvm_init);
+  plugin_register_init("lvm", c_lvm_init);
   plugin_register_read("lvm", lvm_read);
 } /* void module_register */