From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 6 Jan 2016 01:52:05 +0000 (-0500)
Subject: librgw: remove search_prefix()
X-Git-Tag: v10.1.0~382^2~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=103b9dde9ef027b732716bfaeabb4797dbdf3a77;p=ceph.git

librgw: remove search_prefix()

Since it turns out this is a synonym for relative_object_name().

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 5b2874d6f4cf..d631fa1ece88 100644
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -346,11 +346,6 @@ namespace rgw {
     }
 
     inline std::string relative_object_name() {
-      return full_object_name(false /* omit_bucket */);
-    }
-
-
-    inline std::string search_prefix() {
       return full_object_name(true /* omit_bucket */);
     }
     
@@ -931,7 +926,7 @@ public:
     // woo
     s->user = user;
 
-    prefix = rgw_fh->search_prefix();
+    prefix = rgw_fh->relative_object_name();
     if (prefix.length() > 0)
       prefix += "/";
     delimiter = '/';
@@ -1583,7 +1578,7 @@ public:
     // woo
     s->user = user;
 
-    prefix = rgw_fh->search_prefix();
+    prefix = rgw_fh->relative_object_name();
     if (prefix.length() > 0)
       prefix += "/";
     prefix += path;