diff options
| author | Yehuda Sadeh <yehuda.sadeh@dreamhost.com> | 2011-12-01 15:38:40 -0800 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda.sadeh@dreamhost.com> | 2011-12-02 09:54:52 -0800 |
| commit | b327b28faf2ae5168662c763ed60f8a0e2075550 (patch) | |
| tree | a7192486e24f9481b9a6abede60bf5313adc3467 | |
| parent | 7aa3b57121beb95db61d695c8091c057719775df (diff) | |
| download | ceph-b327b28faf2ae5168662c763ed60f8a0e2075550.tar.gz | |
libradosgw: header compiles
| -rw-r--r-- | src/rgw/libradosgw.hpp (renamed from src/rgw/libradosgw.h) | 36 | ||||
| -rw-r--r-- | src/rgw/rgw_main.cc | 2 |
2 files changed, 24 insertions, 14 deletions
diff --git a/src/rgw/libradosgw.h b/src/rgw/libradosgw.hpp index 3e0319189fc..c87b3e7f0cc 100644 --- a/src/rgw/libradosgw.h +++ b/src/rgw/libradosgw.hpp @@ -1,21 +1,29 @@ #ifndef __LIBRADOSGW_HPP #define __LIBRADOSGW_HPP +#include <string> +#include <map> + +#include "rados/librados.hpp" + + namespace libradosgw { + using std::string; + using librados::Rados; using ceph::bufferlist; enum RGWPerm { - PERM_READ = 0x01; - PERM_WRITE = 0x02; - PERM_READ_ACP = 0x04; - PERM_WRITE_ACP = 0x08; + PERM_READ = 0x01, + PERM_WRITE = 0x02, + PERM_READ_ACP = 0x04, + PERM_WRITE_ACP = 0x08, }; enum RGWGroup { - GROUP_NOT_GROUP = 0; - GROUP_ANONYMOUS = 1; - GROUP_AUTHENTICATED = 2; + GROUP_NOT_GROUP = 0, + GROUP_ANONYMOUS = 1, + GROUP_AUTHENTICATED = 2, }; class User { @@ -34,12 +42,12 @@ namespace libradosgw { struct ACLs { User owner; - map<User, int> acl_map; + std::map<User, int> acl_map; }; struct Attrs { - map<string, ceph::bufferlist> meta_map; + std::map<string, ceph::bufferlist> meta_map; }; struct BucketInfo { @@ -117,8 +125,8 @@ namespace libradosgw { public: Bucket(); - BucketIterator objects_begin(const char *delim = NULL, const char *marker = NULL); - BucketIterator objects_find(char *marker, int max = 0, const char *delim = NULL, const char *marker = NULL); + BucketIterator objects_begin(const char *prefix = NULL, const char *delim = NULL); + BucketIterator objects_find(char *marker, int max = 0, const char *prefix = NULL, const char *delim = NULL); BucketMultipartIterator multipart_uploads_begin(); const BucketMultipartIterator& multipart_uploads_end(); @@ -127,11 +135,11 @@ namespace libradosgw { int open(string& name, Object& obj); int stat(string&name, ObjectInfo& info); - int create(string& name, Object& obj, ACLS *acls = NULL); + int create(string& name, Object& obj, ACLs *acls = NULL); int remove(string& name); - int create_multipart(string& name, MultipartObject& obj, ACLS *acls = NULL); - int create_manifest(string& name, ManifestObject& obj, ACLS *acls = NULL); + int create_multipart(string& name, MultipartObject& obj, ACLs *acls = NULL); + int create_manifest(string& name, ManifestObject& obj, ACLs *acls = NULL); int cancel_multipart_upload(MultipartObject& obj); diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 858d08a8ba1..ee6263fc425 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -33,6 +33,8 @@ #include "rgw_log.h" #include "rgw_tools.h" +#include "libradosgw.hpp" + #include <map> #include <string> #include <vector> |