From: Ruben Kerkhof Date: Sat, 15 Dec 2018 17:53:24 +0000 (+0100) Subject: ovs_stats plugin: fix some stylistic issues X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=bcc7d4720491aac9302cbe91629487d3ddedbc8f ovs_stats plugin: fix some stylistic issues --- diff --git a/src/ovs_stats.c b/src/ovs_stats.c index 1bf8e4e6..eca7329e 100644 --- a/src/ovs_stats.c +++ b/src/ovs_stats.c @@ -579,8 +579,8 @@ static interface_list_t *ovs_stats_new_port_interface(port_list_t *port, interface_list_t *iface = ovs_stats_get_port_interface(port, uuid); if (iface == NULL) { - iface = (interface_list_t *)calloc(1, sizeof(interface_list_t)); - if (!iface) { + iface = calloc(1, sizeof(*iface)); + if (iface == NULL) { ERROR("%s: Error allocating interface", plugin_name); return NULL; } @@ -602,8 +602,8 @@ static port_list_t *ovs_stats_new_port(bridge_list_t *bridge, port_list_t *port = ovs_stats_get_port(uuid); if (port == NULL) { - port = (port_list_t *)calloc(1, sizeof(port_list_t)); - if (!port) { + port = calloc(1, sizeof(*port)); + if (port == NULL) { ERROR("%s: Error allocating port", plugin_name); return NULL; } @@ -703,7 +703,7 @@ static int ovs_stats_update_bridge(yajl_val bridge) { ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name)); if (br == NULL) { br = calloc(1, sizeof(*br)); - if (!br) { + if (br == NULL) { ERROR("%s: calloc(%zu) failed.", plugin_name, sizeof(*br)); return -1; } @@ -1312,7 +1312,7 @@ static int ovs_stats_plugin_config(oconfig_item_t *ci) { char const *br_name = child->values[j].value.string; if ((bridge = ovs_stats_get_bridge(g_monitored_bridge_list_head, br_name)) == NULL) { - if ((bridge = calloc(1, sizeof(bridge_list_t))) == NULL) { + if ((bridge = calloc(1, sizeof(*bridge))) == NULL) { ERROR("%s: Error allocating memory for bridge", plugin_name); goto cleanup_fail; } else {