From fc4ce2a88aae92b6bf670453f73b7a550c408710 Mon Sep 17 00:00:00 2001
From: Brian Candler <b.candler@pobox.com>
Date: Thu, 14 Feb 2013 12:15:46 +0000
Subject: [PATCH] Remove superfluous redis_escape_func

---
 src/modules/rlm_redis/rlm_redis.c | 48 -------------------------------
 src/modules/rlm_redis/rlm_redis.h |  1 -
 2 files changed, 49 deletions(-)

diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index a2e376efb8..f77ac0f180 100644
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -173,53 +173,6 @@ static void redis_poolfree(REDIS_INST * inst)
 	inst->redispool = NULL;
 }
 
-static size_t redis_escape_func(char *out, size_t outlen, const char *in)
-{
-
-	size_t len = 0;
-
-	while (*in) {
-		/*
-		 *	Non-printable characters get replaced with their
-		 *	mime-encoded equivalents.
-		 */
-		if ((*in <= 32) || (*in == '\\')) {
-			/*
-			 *	Only 3 or less bytes available.
-			 */
-			if (outlen <= 3) {
-				break;
-			}
-
-			snprintf(out, outlen, "=%02X", (unsigned char) in[0]);
-			in++;
-			out += 3;
-			outlen -= 3;
-			len += 3;
-			continue;
-		}
-
-		/*
-		 *	Only one byte left.
-		 */
-		if (outlen <= 1) {
-			break;
-		}
-
-		/*
-		 *	Allowed character.
-		 */
-		*out = *in;
-		out++;
-		in++;
-		outlen--;
-		len++;
-	}
-	*out = '\0';
-	return len;
-
-}
-
 static int redis_xlat(void *instance, REQUEST *request,
 		      char *fmt, char *out, size_t freespace,
 		      UNUSED RADIUS_ESCAPE_STRING func)
@@ -647,7 +600,6 @@ static int redis_instantiate(CONF_SECTION *conf, void **instance)
 	inst->redis_finish_query = rlm_redis_finish_query;
 	inst->redis_get_socket = redis_get_socket;
 	inst->redis_release_socket = redis_release_socket;
-	inst->redis_escape_func = redis_escape_func;
 
 	*instance = inst;
 
diff --git a/src/modules/rlm_redis/rlm_redis.h b/src/modules/rlm_redis/rlm_redis.h
index 732559f32e..2859efaeb9 100644
--- a/src/modules/rlm_redis/rlm_redis.h
+++ b/src/modules/rlm_redis/rlm_redis.h
@@ -74,7 +74,6 @@ typedef struct rlm_redis_t {
         int (*redis_query)(REDISSOCK *dissocket, REDIS_INST *inst,
                            const char *query, REQUEST *request);
         int (*redis_finish_query)(REDISSOCK *dissocket);
-        size_t (*redis_escape_func)(char *out, size_t outlen, const char *in);
 
 } rlm_redis_t;
 
-- 
2.47.2