projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pr/1345'
[collectd.git]
/
src
/
daemon
/
meta_data.c
diff --git
a/src/daemon/meta_data.c
b/src/daemon/meta_data.c
index
d3da9bb
..
4e46ed5
100644
(file)
--- a/
src/daemon/meta_data.c
+++ b/
src/daemon/meta_data.c
@@
-255,7
+255,6
@@
void meta_data_destroy (meta_data_t *md) /* {{{ */
if (md == NULL)
return;
if (md == NULL)
return;
- pthread_mutex_destroy(&md->lock);
md_entry_free (md->head);
pthread_mutex_destroy (&md->lock);
free (md);
md_entry_free (md->head);
pthread_mutex_destroy (&md->lock);
free (md);
@@
-494,7
+493,7
@@
int meta_data_get_string (meta_data_t *md, /* {{{ */
if (e->type != MD_TYPE_STRING)
{
if (e->type != MD_TYPE_STRING)
{
- ERROR ("meta_data_get_s
igned_int
: Type mismatch for key `%s'", e->key);
+ ERROR ("meta_data_get_s
tring
: Type mismatch for key `%s'", e->key);
pthread_mutex_unlock (&md->lock);
return (-ENOENT);
}
pthread_mutex_unlock (&md->lock);
return (-ENOENT);
}