treewide: Use AF_UNSPEC consistently

[collectd.git] / src / openldap.c

diff --git a/src/openldap.c b/src/openldap.c
index 615aee3..3dac057 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -624,9 +624,8 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
        if ((status == 0) && (st->url != NULL))
        {
                LDAPURLDesc *ludpp;
-               int rc;
 
-               if ((rc = ldap_url_parse (st->url, &ludpp)) != 0)
+               if (ldap_url_parse (st->url, &ludpp) != 0)
                {
                        ERROR ("openldap plugin: Instance `%s': "
                                "Invalid URL: `%s'",
@@ -654,17 +653,15 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
                }
                else
                {
-                       user_data_t ud;
-                       char callback_name[3*DATA_MAX_NAME_LEN];
+                       user_data_t ud = { 0 };
+                       char callback_name[3*DATA_MAX_NAME_LEN] = { 0 };
 
                        databases = temp;
                        databases[databases_num] = st;
                        databases_num++;
 
-                       memset (&ud, 0, sizeof (ud));
                        ud.data = st;
 
-                       memset (callback_name, 0, sizeof (callback_name));
                        ssnprintf (callback_name, sizeof (callback_name),
                                        "openldap/%s/%s",
                                        (st->host != NULL) ? st->host : hostname_g,