projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2874 from elfiesmelfie/feat_virt_block_info
[collectd.git]
/
src
/
daemon
/
utils_cache.c
diff --git
a/src/daemon/utils_cache.c
b/src/daemon/utils_cache.c
index
610c11e
..
c53e5d1
100644
(file)
--- a/
src/daemon/utils_cache.c
+++ b/
src/daemon/utils_cache.c
@@
-28,10
+28,10
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
-#include "meta_data.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
#include "utils_cache.h"
#include <assert.h>
#include "utils_cache.h"
#include <assert.h>
@@
-201,7
+201,7
@@
static int uc_insert(const data_set_t *ds, const value_list_t *vl,
ce->last_time = vl->time;
ce->last_update = cdtime();
ce->interval = vl->interval;
ce->last_time = vl->time;
ce->last_update = cdtime();
ce->interval = vl->interval;
- ce->state = STATE_
OKAY
;
+ ce->state = STATE_
UNKNOWN
;
if (c_avl_insert(cache_tree, key_copy, ce) != 0) {
sfree(key_copy);
if (c_avl_insert(cache_tree, key_copy, ce) != 0) {
sfree(key_copy);
@@
-826,9
+826,7
@@
int uc_inc_hits(const data_set_t *ds, const value_list_t *vl, int step) {
* Iterator interface
*/
uc_iter_t *uc_get_iterator(void) {
* Iterator interface
*/
uc_iter_t *uc_get_iterator(void) {
- uc_iter_t *iter;
-
- iter = (uc_iter_t *)calloc(1, sizeof(*iter));
+ uc_iter_t *iter = calloc(1, sizeof(*iter));
if (iter == NULL)
return NULL;
if (iter == NULL)
return NULL;