]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librgw: remove search_prefix()
authorMatt Benjamin <mbenjamin@redhat.com>
Wed, 6 Jan 2016 01:52:05 +0000 (20:52 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Fri, 12 Feb 2016 17:07:26 +0000 (12:07 -0500)
Since it turns out this is a synonym for relative_object_name().

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.h

index 5b2874d6f4cf0a0185bd507f5a7701276a9bbb01..d631fa1ece88604a5d9f7bc9f80b82ed31301208 100644 (file)
@@ -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;