From 3bea01f01d76e1e95a8239c0d3f67073992136a1 Mon Sep 17 00:00:00 2001 From: Jan Zeleny Date: Wed, 14 Dec 2011 07:20:11 -0500 Subject: Don't give memory context in confdb where not needed --- src/monitor/monitor.c | 8 ++++---- src/monitor/monitor_sbus.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/monitor') diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 5293a3453..a93b23460 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -781,7 +781,7 @@ int get_monitor_config(struct mt_ctx *ctx) int timeout_seconds; char *badsrv = NULL; - ret = confdb_get_int(ctx->cdb, ctx, + ret = confdb_get_int(ctx->cdb, CONFDB_MONITOR_CONF_ENTRY, CONFDB_MONITOR_SBUS_TIMEOUT, 10, &timeout_seconds); @@ -932,7 +932,7 @@ static int get_service_config(struct mt_ctx *ctx, const char *name, } } - ret = confdb_get_int(ctx->cdb, svc, path, + ret = confdb_get_int(ctx->cdb, path, CONFDB_SERVICE_TIMEOUT, MONITOR_DEF_PING_TIME, &svc->ping_time); if (ret != EOK) { @@ -1031,7 +1031,7 @@ static int get_provider_config(struct mt_ctx *ctx, const char *name, return ret; } - ret = confdb_get_int(ctx->cdb, svc, path, + ret = confdb_get_int(ctx->cdb, path, CONFDB_DOMAIN_TIMEOUT, MONITOR_DEF_PING_TIME, &svc->ping_time); if (ret != EOK) { @@ -1799,7 +1799,7 @@ static int monitor_config_file(TALLOC_CTX *mem_ctx, ctx->file_ctx->mt_ctx = ctx; } - ret = confdb_get_bool(ctx->cdb, ctx, + ret = confdb_get_bool(ctx->cdb, CONFDB_MONITOR_CONF_ENTRY, CONFDB_MONITOR_TRY_INOTIFY, true, &use_inotify); diff --git a/src/monitor/monitor_sbus.c b/src/monitor/monitor_sbus.c index a1c6ad338..66270a7fa 100644 --- a/src/monitor/monitor_sbus.c +++ b/src/monitor/monitor_sbus.c @@ -192,7 +192,7 @@ errno_t monitor_common_rotate_logs(struct confdb_ctx *confdb, } /* Get new debug level from the confdb */ - ret = confdb_get_int(confdb, NULL, conf_path, + ret = confdb_get_int(confdb, conf_path, CONFDB_SERVICE_DEBUG_LEVEL, old_debug_level, &debug_level); -- cgit