projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34e35c5
)
change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
author
Dylan Stephano-Shachter
<dylan@wopr.nasuni.net>
Thu, 15 Feb 2018 21:37:33 +0000
(16:37 -0500)
committer
Dylan Stephano-Shachter
<dylan@wopr.nasuni.net>
Thu, 15 Feb 2018 21:37:33 +0000
(16:37 -0500)
src/disk.c
patch
|
blob
|
history
diff --git
a/src/disk.c
b/src/disk.c
index
004ce9e
..
04f3374
100644
(file)
--- a/
src/disk.c
+++ b/
src/disk.c
@@
-139,7
+139,7
@@
static int pnumdisk;
#error "No applicable input method."
#endif
#error "No applicable input method."
#endif
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
#include <libudev.h>
static char *conf_udev_name_attr = NULL;
#include <libudev.h>
static char *conf_udev_name_attr = NULL;
@@
-173,7
+173,7
@@
static int disk_config(const char *key, const char *value) {
"on Mach / Mac OS X and will be ignored.");
#endif
} else if (strcasecmp("UdevNameAttr", key) == 0) {
"on Mach / Mac OS X and will be ignored.");
#endif
} else if (strcasecmp("UdevNameAttr", key) == 0) {
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
if (conf_udev_name_attr != NULL) {
free(conf_udev_name_attr);
conf_udev_name_attr = NULL;
if (conf_udev_name_attr != NULL) {
free(conf_udev_name_attr);
conf_udev_name_attr = NULL;
@@
-209,7
+209,7
@@
static int disk_init(void) {
/* #endif HAVE_IOKIT_IOKITLIB_H */
#elif KERNEL_LINUX
/* #endif HAVE_IOKIT_IOKITLIB_H */
#elif KERNEL_LINUX
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
if (conf_udev_name_attr != NULL) {
handle_udev = udev_new();
if (handle_udev == NULL) {
if (conf_udev_name_attr != NULL) {
handle_udev = udev_new();
if (handle_udev == NULL) {
@@
-217,7
+217,7
@@
static int disk_init(void) {
return -1;
}
}
return -1;
}
}
-#endif /* HAVE_UDEV_H */
+#endif /* HAVE_
LIB
UDEV_H */
/* #endif KERNEL_LINUX */
#elif KERNEL_FREEBSD
/* #endif KERNEL_LINUX */
#elif KERNEL_FREEBSD
@@
-260,10
+260,10
@@
static int disk_init(void) {
static int disk_shutdown(void) {
#if KERNEL_LINUX
static int disk_shutdown(void) {
#if KERNEL_LINUX
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
if (handle_udev != NULL)
udev_unref(handle_udev);
if (handle_udev != NULL)
udev_unref(handle_udev);
-#endif /* HAVE_UDEV_H */
+#endif /* HAVE_
LIB
UDEV_H */
#endif /* KERNEL_LINUX */
return 0;
} /* int disk_shutdown */
#endif /* KERNEL_LINUX */
return 0;
} /* int disk_shutdown */
@@
-325,7
+325,7
@@
static counter_t disk_calc_time_incr(counter_t delta_time,
}
#endif
}
#endif
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
/**
* Attempt to provide an rename disk instance from an assigned udev attribute.
*
/**
* Attempt to provide an rename disk instance from an assigned udev attribute.
*
@@
-841,7
+841,7
@@
static int disk_read(void) {
output_name = disk_name;
output_name = disk_name;
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
char *alt_name = NULL;
if (conf_udev_name_attr != NULL) {
alt_name =
char *alt_name = NULL;
if (conf_udev_name_attr != NULL) {
alt_name =
@@
-852,7
+852,7
@@
static int disk_read(void) {
#endif
if (ignorelist_match(ignorelist, output_name) != 0) {
#endif
if (ignorelist_match(ignorelist, output_name) != 0) {
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
/* release udev-based alternate name, if allocated */
sfree(alt_name);
#endif
/* release udev-based alternate name, if allocated */
sfree(alt_name);
#endif
@@
-878,7
+878,7
@@
static int disk_read(void) {
submit_io_time(output_name, io_time, weighted_time);
} /* if (is_disk) */
submit_io_time(output_name, io_time, weighted_time);
} /* if (is_disk) */
-#if HAVE_UDEV_H
+#if HAVE_
LIB
UDEV_H
/* release udev-based alternate name, if allocated */
sfree(alt_name);
#endif
/* release udev-based alternate name, if allocated */
sfree(alt_name);
#endif