projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mutex lock in read_event
[collectd.git]
/
src
/
smart.c
diff --git
a/src/smart.c
b/src/smart.c
index
3188d1c
..
627c16d
100644
(file)
--- a/
src/smart.c
+++ b/
src/smart.c
@@
-26,9
+26,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
#include <atasmart.h>
#include <libudev.h>
#include <atasmart.h>
#include <libudev.h>
@@
-42,15
+42,15
@@
static const char *config_keys[] = {"Disk", "IgnoreSelected", "IgnoreSleepMode",
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
-static ignorelist_t *ignorelist
= NULL
;
-static int ignore_sleep_mode
= 0
;
-static int use_serial
= 0
;
+static ignorelist_t *ignorelist;
+static int ignore_sleep_mode;
+static int use_serial;
static int smart_config(const char *key, const char *value) {
if (ignorelist == NULL)
ignorelist = ignorelist_create(/* invert = */ 1);
if (ignorelist == NULL)
static int smart_config(const char *key, const char *value) {
if (ignorelist == NULL)
ignorelist = ignorelist_create(/* invert = */ 1);
if (ignorelist == NULL)
- return
(1)
;
+ return
1
;
if (strcasecmp("Disk", key) == 0) {
ignorelist_add(ignorelist, value);
if (strcasecmp("Disk", key) == 0) {
ignorelist_add(ignorelist, value);
@@
-66,10
+66,10
@@
static int smart_config(const char *key, const char *value) {
if (IS_TRUE(value))
use_serial = 1;
} else {
if (IS_TRUE(value))
use_serial = 1;
} else {
- return
(-1)
;
+ return
-1
;
}
}
- return
(0)
;
+ return
0
;
} /* int smart_config */
static void smart_submit(const char *dev, const char *type,
} /* int smart_config */
static void smart_submit(const char *dev, const char *type,
@@
-217,7
+217,7
@@
static int smart_read(void) {
handle_udev = udev_new();
if (!handle_udev) {
ERROR("smart plugin: unable to initialize udev.");
handle_udev = udev_new();
if (!handle_udev) {
ERROR("smart plugin: unable to initialize udev.");
- return
(-1)
;
+ return
-1
;
}
enumerate = udev_enumerate_new(handle_udev);
udev_enumerate_add_match_subsystem(enumerate, "block");
}
enumerate = udev_enumerate_new(handle_udev);
udev_enumerate_add_match_subsystem(enumerate, "block");
@@
-239,7
+239,7
@@
static int smart_read(void) {
udev_enumerate_unref(enumerate);
udev_unref(handle_udev);
udev_enumerate_unref(enumerate);
udev_unref(handle_udev);
- return
(0)
;
+ return
0
;
} /* int smart_read */
static int smart_init(void) {
} /* int smart_read */
static int smart_init(void) {
@@
-256,7
+256,7
@@
static int smart_init(void) {
"running \"setcap cap_sys_rawio=ep\" on the collectd binary.");
}
#endif
"running \"setcap cap_sys_rawio=ep\" on the collectd binary.");
}
#endif
- return
(0)
;
+ return
0
;
} /* int smart_init */
void module_register(void) {
} /* int smart_init */
void module_register(void) {