From aa969585d6e0789bcba5fc08e9aea9aa1c0ff13c Mon Sep 17 00:00:00 2001
From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 26 Jan 2016 22:20:08 -0500
Subject: [PATCH] librgw: remove deprecated librgw methods

Remove unused routines:

 * librgw_acl_bin2xml
 * librgw_free_xml
 * librgw_acl_xml2bin
 * librgw_free_bin(librgw_t rgw, char* bin)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---
 src/rgw/librgw.cc | 86 -----------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 93a3578680859..1b706752bdd9e 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -586,92 +586,6 @@ int librgw_create(librgw_t* rgw, int argc, char **argv)
   return 0;
 }
 
-int librgw_acl_bin2xml(librgw_t rgw, const char* bin, int bin_len, char** xml)
-{
-  CephContext* cct = static_cast<CephContext*>(rgw);
-  try {
-    // convert to bufferlist
-    bufferlist bl;
-    bl.append(bin, bin_len);
-
-    // convert to RGWAccessControlPolicy
-    RGWAccessControlPolicy_S3 acl(cct);
-    bufferlist::iterator bli(bl.begin());
-    acl.decode(bli);
-
-    // convert to XML stringstream
-    stringstream ss;
-    acl.to_xml(ss);
-
-    // convert to XML C string
-    *xml = strdup(ss.str().c_str());
-    if (!*xml)
-      return -ENOBUFS;
-    return 0;
-  }
-  catch (const std::exception& e) {
-    lderr(cct) << "librgw_acl_bin2xml: caught exception " << e.what() << dendl;
-    return -2000;
-  }
-  catch (...) {
-    lderr(cct) << "librgw_acl_bin2xml: caught unknown exception " << dendl;
-    return -2000;
-  }
-}
-
-void librgw_free_xml(librgw_t rgw, char *xml)
-{
-  free(xml);
-}
-
-int librgw_acl_xml2bin(librgw_t rgw, const char* xml, char** bin, int* bin_len)
-{
-  CephContext* cct = static_cast<CephContext*>(rgw);
-  char *bin_ = NULL;
-  try {
-    RGWACLXMLParser_S3 parser(cct);
-    if (!parser.init()) {
-      return -1000;
-    }
-    if (!parser.parse(xml, strlen(xml), true)) {
-      return -EINVAL;
-    }
-    RGWAccessControlPolicy_S3* policy =
-      (RGWAccessControlPolicy_S3*)parser.find_first("AccessControlPolicy");
-    if (!policy) {
-      return -1001;
-    }
-    bufferlist bl;
-    policy->encode(bl);
-
-    bin_ = (char*)malloc(bl.length());
-    if (!bin_) {
-      return -ENOBUFS;
-    }
-    int bin_len_ = bl.length();
-    bl.copy(0, bin_len_, bin_);
-
-    *bin = bin_;
-    *bin_len = bin_len_;
-    return 0;
-  }
-  catch (const std::exception& e) {
-    lderr(cct) << "librgw_acl_bin2xml: caught exception " << e.what() << dendl;
-  }
-  catch (...) {
-    lderr(cct) << "librgw_acl_bin2xml: caught unknown exception " << dendl;
-  }
-  if (!bin_)
-    free(bin_);
-  bin_ = NULL;
-  return -2000;
-}
-
-void librgw_free_bin(librgw_t rgw, char* bin)
-{
-  free(bin);
-}
-
 void librgw_shutdown(librgw_t rgw)
 {
   using namespace rgw;
-- 
2.39.5