From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 20 Sep 2012 12:49:19 +0000 (+0100)
Subject: Mark instance as unused in %{rand:}
X-Git-Tag: release_3_0_0_beta1~1696
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=756523e2b7086633b3efd995786b53dfcdfa81f6;p=thirdparty%2Ffreeradius-server.git

Mark instance as unused in %{rand:}
---

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 3b81595bd92..bc51ac8828a 100644
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -260,21 +260,23 @@ static size_t expr_xlat(void *instance, REQUEST *request, const char *fmt,
 	return strlen(out);
 }
 
-static size_t rand_xlat(void *instance, REQUEST *request, const char *fmt,
+/**
+ *  @brief Generate a random integer value
+ *
+ */
+static size_t rand_xlat(UNUSED void *instance, REQUEST *request, const char *fmt,
 			char *out, size_t outlen,
 			RADIUS_ESCAPE_STRING func)
 {
 	int64_t		result;
-	rlm_expr_t	*inst = instance;
 	char		buffer[256];
 
-	inst = inst;		/* -Wunused */
-
 	/*
 	 * Do an xlat on the provided string (nice recursive operation).
 	 */
 	if (!radius_xlat(buffer, sizeof(buffer), fmt, request, func)) {
 		radlog(L_ERR, "rlm_expr: xlat failed.");
+		*out = '\0';
 		return 0;
 	}