From a1cf02b2ce0cefc1bb6466a6d46f416bbf1a4d80 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 19 Aug 2007 18:08:27 +0000
Subject: [PATCH] Eliminate some dead code and remove code duplication

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@832 726aef4b-f618-498e-8847-2d620e286838
---
 String.cpp | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/String.cpp b/String.cpp
index 7d25e351..57bc27b3 100644
--- a/String.cpp
+++ b/String.cpp
@@ -718,43 +718,23 @@ bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
 		if (uWrap && i % 57) {
 			*p++ = '\n';
 		}
-
-		*p = 0;
-
-		sRet = (char*) output;
-		delete[] output;
-		return true;
 	} else {
 		*p++ = b64table[input[i++] >> 2];
 		*p++ = b64table[((input[i - 1] << 4) | (input[i] >> 4)) & 0x3f];
 		if (mod == 1) {
 			*p++ = '=';
-			*p++ = '=';
-
-			if (uWrap) {
-				*p++ = '\n';
-			}
-
-			*p = 0;
-
-			sRet = (char*) output;
-			delete[] output;
-			return true;
 		} else {
 			*p++ = b64table[(input[i] << 2) & 0x3f];
-			*p++ = '=';
+		}
 
-			if (uWrap) {
-				*p++ = '\n';
-			}
+		*p++ = '=';
 
-			*p = 0;
-			sRet = (char*) output;
-			delete[] output;
-			return true;
+		if (uWrap) {
+			*p++ = '\n';
 		}
 	}
 
+	*p = 0;
 	sRet = (char*) output;
 	delete[] output;
 	return true;