projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
utils_ovs.c
diff --git
a/src/utils_ovs.c
b/src/utils_ovs.c
index
ae82253
..
3c448e3
100644
(file)
--- a/
src/utils_ovs.c
+++ b/
src/utils_ovs.c
@@
-1003,9
+1003,10
@@
ovs_db_t *ovs_db_init(const char *node, const char *service,
return NULL;
/* allocate db data & fill it */
return NULL;
/* allocate db data & fill it */
- ovs_db_t *pdb =
pdb =
calloc(1, sizeof(*pdb));
+ ovs_db_t *pdb = calloc(1, sizeof(*pdb));
if (pdb == NULL)
return NULL;
if (pdb == NULL)
return NULL;
+ pdb->sock = -1;
/* store the OVS DB address */
sstrncpy(pdb->node, node, sizeof(pdb->node));
/* store the OVS DB address */
sstrncpy(pdb->node, node, sizeof(pdb->node));
@@
-1047,7
+1048,6
@@
ovs_db_t *ovs_db_init(const char *node, const char *service,
}
/* init polling thread */
}
/* init polling thread */
- pdb->sock = -1;
if (ovs_db_poll_thread_init(pdb) < 0) {
ovs_db_destroy(pdb);
return NULL;
if (ovs_db_poll_thread_init(pdb) < 0) {
ovs_db_destroy(pdb);
return NULL;