From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 14 Jun 2017 14:25:51 +0000 (-0400)
Subject: Cleanup calls to cf_log_err
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8a016530f8af32fef5d153f351708ecbe08772;p=thirdparty%2Ffreeradius-server.git

Cleanup calls to cf_log_err
---

diff --git a/src/main/cf_parse.c b/src/main/cf_parse.c
index 2cc4dea6c4c..f8865315cfa 100644
--- a/src/main/cf_parse.c
+++ b/src/main/cf_parse.c
@@ -436,7 +436,7 @@ static int cf_pair_default(CONF_PAIR **out, CONF_SECTION *cs, char const *name,
 	 */
 	expanded = cf_expand_variables("<internal>", &lineno, cs, buffer, sizeof(buffer), dflt, NULL);
 	if (!expanded) {
-		cf_log_err(&(cs->item), "Failed expanding variable %s", name);
+		cf_log_err(cs, "Failed expanding variable %s", name);
 		return -1;
 	}
 
@@ -1019,7 +1019,7 @@ int cf_section_parse(TALLOC_CTX *ctx, void *base, CONF_SECTION *cs)
 		case -2:	/* Deprecated CONF ITEM */
 			if (((rule + 1)->offset && ((rule + 1)->offset == rule->offset)) ||
 			    ((rule + 1)->data && ((rule + 1)->data == rule->data))) {
-				cf_log_err(&(cs->item), "Replace \"%s\" with \"%s\"", rule->name,
+				cf_log_err(cs, "Replace \"%s\" with \"%s\"", rule->name,
 					   (rule + 1)->name);
 			}
 			goto finish;