From 2573b6408eb7780cee4b38bfecb1c3feb5fdbd72 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Tue, 7 Oct 2008 13:45:34 +0000
Subject: [PATCH] Mark some global vars as const and static and some static
 local vars as const

This way the compiler puts those vars in .rodata instead of .data and everyone
happy. (Plus we have one symbol less exported)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1241 726aef4b-f618-498e-8847-2d620e286838
---
 MD5.cpp       | 6 +++---
 MD5.h         | 4 ++--
 ZNCString.cpp | 4 ++--
 ZNCString.h   | 2 --
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/MD5.cpp b/MD5.cpp
index efaf88a4..5e3d2629 100644
--- a/MD5.cpp
+++ b/MD5.cpp
@@ -61,7 +61,7 @@ void CMD5::md5_starts(md5_context *ctx) const {
 	ctx->state[3] = 0x10325476;
 }
 
-void CMD5::md5_process(md5_context *ctx, uint8 data[64]) const {
+void CMD5::md5_process(md5_context *ctx, const uint8 data[64]) const {
 	uint32 X[16], A, B, C, D;
 
 	GET_UINT32(X[0],  data,  0);
@@ -180,7 +180,7 @@ void CMD5::md5_process(md5_context *ctx, uint8 data[64]) const {
 	ctx->state[3] += D;
 }
 
-void CMD5::md5_update(md5_context *ctx, uint8 *input, uint32 length) const {
+void CMD5::md5_update(md5_context *ctx, const uint8 *input, uint32 length) const {
 	uint32 left, fill;
 
 	if (!length) return;
@@ -215,7 +215,7 @@ void CMD5::md5_update(md5_context *ctx, uint8 *input, uint32 length) const {
 	}
 }
 
-static uint8 md5_padding[64] = {
+static const uint8 md5_padding[64] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/MD5.h b/MD5.h
index 534507cc..8319ed4c 100644
--- a/MD5.h
+++ b/MD5.h
@@ -46,11 +46,11 @@ public:
 
 protected:
 	void md5_starts( md5_context *ctx ) const;
-	void md5_update( md5_context *ctx, uint8 *input, uint32 length ) const;
+	void md5_update( md5_context *ctx, const uint8 *input, uint32 length ) const;
 	void md5_finish( md5_context *ctx, uint8 digest[16] ) const;
 
 private:
-	void md5_process( md5_context *ctx, uint8 data[64] ) const;
+	void md5_process( md5_context *ctx, const uint8 data[64] ) const;
 };
 
 #endif /* _MD5_H */
diff --git a/ZNCString.cpp b/ZNCString.cpp
index 2ae79402..31eb8366 100644
--- a/ZNCString.cpp
+++ b/ZNCString.cpp
@@ -14,7 +14,7 @@
 
 using std::stringstream;
 
-const char* g_szHTMLescapes[256] = {
+static const char* const g_szHTMLescapes[256] = {
 	"&#0;", 0, 0, 0, 0, 0, 0, 0, 0, 0,               // 0-9
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                    // 10-19
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                    // 20-29
@@ -716,7 +716,7 @@ CString CString::Base64Decode_n() const {
 }
 
 bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
-	static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	const char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 	sRet.clear();
 	size_t len = size();
 	const unsigned char* input = (const unsigned char*) c_str();
diff --git a/ZNCString.h b/ZNCString.h
index 7b693fea..950c6718 100644
--- a/ZNCString.h
+++ b/ZNCString.h
@@ -50,8 +50,6 @@ static const unsigned char base64_table[256] = {
 	XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
 };
 
-extern const char* g_szHTMLescapes[256];
-
 class CString : public string {
 public:
 	typedef enum {