Friday, May 12, 2017

[389-commits] [389-ds-base] 01/01: Ticket 49165 - Fix compiler warnings

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch master
in repository 389-ds-base.

commit 120e818cc2d2948350d98fac2a77dc785c6d6613
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Fri May 12 12:19:13 2017 -0400

Ticket 49165 - Fix compiler warnings

Description: Fix compiler warnings

https://pagure.io/389-ds-base/issue/49185

Reviewd by: mreynolds(one line commit rule)
---
ldap/servers/slapd/back-ldbm/dblayer.c | 4 ++--
ldap/servers/slapd/main.c | 9 +--------
ldap/servers/slapd/task.c | 2 +-
3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index 4fde295..0e81643 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -1267,7 +1267,7 @@ dblayer_start(struct ldbminfo *li, int dbmode)
/* li->li_directory comes from nsslapd-directory */
/* dblayer_home_directory is freed in dblayer_post_close.
* li_directory needs to live beyond dblayer. */
- slapi_ch_free(&priv->dblayer_home_directory);
+ slapi_ch_free_string(&priv->dblayer_home_directory);
priv->dblayer_home_directory = slapi_ch_strdup(li->li_directory);
priv->dblayer_cachesize = li->li_dbcachesize;
priv->dblayer_lock_config = li->li_dblock;
@@ -7002,7 +7002,7 @@ dblayer_restore_file_update(struct ldbminfo *li, char *directory)
PRFileDesc *prfd;
char *fname = dblayer_restore_file_name(li);
dblayer_file_open(fname, PR_RDWR, li->li_mode, &prfd);
- slapi_ch_free(&fname);
+ slapi_ch_free_string(&fname);
if (prfd) {
char *line = slapi_ch_smprintf("restore of %s succeeded", directory);
slapi_write_buffer(prfd, line, strlen(line));
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 7d27e83..85e4c6f 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -185,7 +185,7 @@ main_create_ns(ns_thrpool_t **tp_in) {
tp_config.max_threads = maxthreads;
tp_config.stacksize = SLAPD_DEFAULT_THREAD_STACKSIZE;
/* Highly likely that we need to re-write logging to be controlled by NS here. */
- /* tp_config.log_fct = nunc_stans_logging; */
+ tp_config.log_fct = nunc_stans_logging;
#ifdef DEBUG
tp_config.log_fct = ns_printf_logger;

No comments:

Post a Comment