From 6a34c6a28292607a4455cfce8fadecca6fc91045 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 19 Nov 2009 12:44:55 -0800
Subject: [PATCH] rgw: fix base64 warnings (move impl to .c file)

---
 src/Makefile.am                           | 3 ++-
 src/{include/base64.h => common/base64.c} | 9 ++-------
 src/common/base64.h                       | 9 +++++++++
 src/rgw/rgw_admin.cc                      | 2 +-
 src/rgw/rgw_main.cc                       | 2 +-
 src/rgw/rgw_op.cc                         | 2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)
 rename src/{include/base64.h => common/base64.c} (81%)
 create mode 100644 src/common/base64.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 563719e82932e..2f3cd824d1f39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -323,6 +323,7 @@ libcommon_files = \
 	common/ConfUtils.cc \
 	common/MemoryModel.cc \
 	common/armor.c \
+	common/base64.c \
 	common/str_list.cc \
 	mon/MonMap.cc \
 	mon/MonClient.cc \
@@ -446,6 +447,7 @@ noinst_HEADERS = \
 	cm.txt\
         common/arch.h\
         common/armor.h\
+	common/base64.h\
 	common/debug.h\
 	common/lockdep.h\
 	common/BackTrace.h\
@@ -486,7 +488,6 @@ noinst_HEADERS = \
 	include/LogEntry.h\
 	include/assert.h\
         include/atomic.h\
-	include/base64.h\
         include/bitmapper.h\
         include/blobhash.h\
         include/buffer.h\
diff --git a/src/include/base64.h b/src/common/base64.c
similarity index 81%
rename from src/include/base64.h
rename to src/common/base64.c
index 4e926d39fd39d..c1245325237f1 100644
--- a/src/include/base64.h
+++ b/src/common/base64.c
@@ -1,13 +1,10 @@
-#ifndef __BASE64_H
-#define __BASE64_H
-
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 
 #include <string.h>
 
-static int encode_base64(const char *in, int in_len, char *out, int out_len)
+int encode_base64(const char *in, int in_len, char *out, int out_len)
 {
   BIO *bmem, *b64;
   BUF_MEM *bptr; 
@@ -33,7 +30,7 @@ static int encode_base64(const char *in, int in_len, char *out, int out_len)
   return 0;
 }
 
-static int decode_base64(const char *in, int in_len, char *out, int out_len)
+int decode_base64(const char *in, int in_len, char *out, int out_len)
 {
   BIO *b64, *bmem;
   int ret;
@@ -52,5 +49,3 @@ static int decode_base64(const char *in, int in_len, char *out, int out_len)
 
   return ret;
 }
-
-#endif
diff --git a/src/common/base64.h b/src/common/base64.h
new file mode 100644
index 0000000000000..a5c96705ef3f9
--- /dev/null
+++ b/src/common/base64.h
@@ -0,0 +1,9 @@
+#ifndef __BASE64_H
+#define __BASE64_H
+
+extern "C" {
+  int encode_base64(const char *in, int in_len, char *out, int out_len);
+  int decode_base64(const char *in, int in_len, char *out, int out_len);
+}
+
+#endif
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 4f7ab8d69569e..f5f8c0f84abfd 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -10,7 +10,7 @@ using namespace std;
 #include <openssl/rand.h>
 #include "common/common_init.h"
 
-#include "include/base64.h"
+#include "common/base64.h"
 #include "rgw_user.h"
 #include "rgw_access.h"
 #include "rgw_acl.h"
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 3501c7d51e114..25c7792773419 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -27,7 +27,7 @@
 #include <sstream>
 
 #include "include/types.h"
-#include "include/base64.h"
+#include "common/base64.h"
 #include "common/BackTrace.h"
 
 using namespace std;
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index bda64086ee7bb..e289c18c974a5 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4,7 +4,7 @@
 
 #include <sstream>
 
-#include "include/base64.h"
+#include "common/base64.h"
 
 #include "rgw_access.h"
 #include "rgw_op.h"
-- 
2.39.5