diff options
author | Yehuda Sadeh <yehuda@inktank.com> | 2013-05-15 17:55:19 -0700 |
---|---|---|
committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-05-16 09:08:46 -0700 |
commit | 14ea8066459bcf7daed2cb396af81968f3c73c71 (patch) | |
tree | c6f5d16952b061d8dceeea98b7937ab01e539b61 | |
parent | edb420c88d146f46a7f739f746d46219ca4014c7 (diff) | |
download | ceph-14ea8066459bcf7daed2cb396af81968f3c73c71.tar.gz |
rgw: remove old cruft
We're not reusing objects anymore, no need for clear()
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r-- | src/rgw/rgw_common.h | 22 | ||||
-rw-r--r-- | src/rgw/rgw_op.h | 6 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index db38e2c9622..3d3592ecc07 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -502,18 +502,10 @@ struct rgw_bucket { rgw_bucket(const char *n) : name(n) { assert(*n == '.'); // only rgw private buckets should be initialized without pool pool = n; - marker = ""; } rgw_bucket(const char *n, const char *p, const char *m, const char *id) : name(n), pool(p), marker(m), bucket_id(id) {} - void clear() { - name = ""; - pool = ""; - marker = ""; - bucket_id = ""; - } - void encode(bufferlist& bl) const { ENCODE_START(4, 3, bl); ::encode(name, bl); @@ -683,13 +675,6 @@ struct RGWObjEnt { string content_type; RGWObjEnt() : size(0), mtime(0) {} - - void clear() { // not clearing etag - name=""; - size = 0; - mtime = 0; - content_type=""; - } }; /** Store basic data on bucket */ @@ -737,13 +722,6 @@ struct RGWBucketEnt { } void dump(Formatter *f) const; static void generate_test_instances(list<RGWBucketEnt*>& o); - void clear() { - bucket.clear(); - size = 0; - size_rounded = 0; - mtime = 0; - count = 0; - } }; WRITE_CLASS_ENCODER(RGWBucketEnt) diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index 184935228b3..eb1d922f1c8 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -773,12 +773,6 @@ public: struct RGWMultipartUploadEntry { RGWObjEnt obj; RGWMPObj mp; - - void clear() { - obj.clear(); - string empty; - mp.init(empty, empty); - } }; class RGWListBucketMultiparts : public RGWOp { |