From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 30 Nov 2012 15:54:47 +0000 (+0000)
Subject: Declare radius_xlat return as size_t
X-Git-Tag: release_3_0_0_beta1~1467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14798a9719e3c8fb35cb38c9edfbc8d41bb35c4;p=thirdparty%2Ffreeradius-server.git

Declare radius_xlat return as size_t
---

diff --git a/src/main/radconf2xml.c b/src/main/radconf2xml.c
index 30f319dba5d..068a14cd056 100644
--- a/src/main/radconf2xml.c
+++ b/src/main/radconf2xml.c
@@ -46,9 +46,9 @@ int debug_flag = 0;
 struct main_config_t mainconfig;
 char *request_log_file = NULL;
 char *debug_log_file = NULL;
-int radius_xlat(UNUSED char *out, UNUSED int outlen, UNUSED const char *fmt,
-		UNUSED REQUEST *request,
-		UNUSED RADIUS_ESCAPE_STRING func, UNUSED void *arg)
+size_t radius_xlat(UNUSED char *out, UNUSED int outlen, UNUSED const char *fmt,
+		   UNUSED REQUEST *request,
+		   UNUSED RADIUS_ESCAPE_STRING func, UNUSED void *arg)
 {
 	return -1;
 }
diff --git a/src/main/radwho.c b/src/main/radwho.c
index 81d1eb02ee9..18e701ab090 100644
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -80,9 +80,9 @@ int log_stripped_names;
 struct main_config_t mainconfig;
 char *request_log_file = NULL;
 char *debug_log_file = NULL;
-int radius_xlat(char *out, UNUSED int outlen, UNUSED const char *fmt,
-		UNUSED REQUEST *request,
-		UNUSED RADIUS_ESCAPE_STRING func, UNUSED void *arg)
+size_t radius_xlat(char *out, UNUSED int outlen, UNUSED const char *fmt,
+		   UNUSED REQUEST *request,
+		   UNUSED RADIUS_ESCAPE_STRING func, UNUSED void *arg)
 {
 	*out = 0;
 	return 0;
diff --git a/src/main/xlat.c b/src/main/xlat.c
index b7194f3b124..e290e851567 100644
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -1202,7 +1202,7 @@ done:
  * @param func function to escape final value e.g. SQL quoting
  * @return length of string written @bug should really have -1 for failure
  */
-int radius_xlat(char *out, int outlen, const char *fmt,
+size_t radius_xlat(char *out, int outlen, const char *fmt,
 		REQUEST *request,
 		RADIUS_ESCAPE_STRING func, void *funcarg)
 {