Treewide: replace ssnprintf with snprintf

[collectd.git] / src / openldap.c

diff --git a/src/openldap.c b/src/openldap.c
index 7aa8c39..7b9b711 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -120,14 +120,9 @@ static int cldap_init_host(cldap_t *st) /* {{{ */
       ERROR("openldap plugin: Failed to start tls on %s: %s", st->url,
             ldap_err2string(rc));
       st->state = 0;
-<<<<<<< HEAD
-      ldap_unbind_ext_s(st->ld, NULL, NULL);
-      return -1;
-=======
       if (st->ld != NULL)
         ldap_unbind_ext_s(st->ld, NULL, NULL);
       return (-1);
->>>>>>> collectd-5.7
     }
   }
 
@@ -146,14 +141,9 @@ static int cldap_init_host(cldap_t *st) /* {{{ */
     ERROR("openldap plugin: Failed to bind to %s: %s", st->url,
           ldap_err2string(rc));
     st->state = 0;
-<<<<<<< HEAD
-    ldap_unbind_ext_s(st->ld, NULL, NULL);
-    return -1;
-=======
     if (st->ld != NULL)
       ldap_unbind_ext_s(st->ld, NULL, NULL);
     return (-1);
->>>>>>> collectd-5.7
   } else {
     DEBUG("openldap plugin: Successfully connected to %s", st->url);
     st->state = 1;
@@ -227,14 +217,9 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
     ERROR("openldap plugin: Failed to execute search: %s", ldap_err2string(rc));
     ldap_msgfree(result);
     st->state = 0;
-<<<<<<< HEAD
-    ldap_unbind_ext_s(st->ld, NULL, NULL);
-    return -1;
-=======
     if (st->ld != NULL)
       ldap_unbind_ext_s(st->ld, NULL, NULL);
     return (-1);
->>>>>>> collectd-5.7
   }
 
   for (LDAPMessage *e = ldap_first_entry(st->ld, result); e != NULL;
@@ -329,7 +314,7 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list =
                  ldap_get_values_len(st->ld, e, "olmBDBEntryCache")) != NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
+          snprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
                     nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
@@ -339,7 +324,7 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBDNCache")) !=
             NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbdncache-%s",
+          snprintf(typeinst, sizeof(typeinst), "bdbdncache-%s",
                     nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
@@ -349,7 +334,7 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBIDLCache")) !=
             NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
+          snprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
                     nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
@@ -495,7 +480,7 @@ static int cldap_config_add(oconfig_item_t *ci) /* {{{ */
       databases[databases_num] = st;
       databases_num++;
 
-      ssnprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
+      snprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
                 (st->host != NULL) ? st->host : hostname_g,
                 (st->name != NULL) ? st->name : "default");