RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48828 from yuvalif/wip-yuval-cython-fails-clang16

Browse Source 
rgw/file: change function signature to match the one generated by cython

reviewed-by: cbodley, mattbenjamin
This commit is contained in:
Yuval Lifshitz 2023-01-23 17:43:56 +02:00 committed by GitHub
commit f4612cee8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/rados/rgw_file.h
View File

@ -221,7 +221,7 @@ int rgw_unlink(struct rgw_fs *rgw_fs,
/*
read directory content
*/
typedef bool (*rgw_readdir_cb)(const char *name, void *arg, uint64_t offset,
typedef int (*rgw_readdir_cb)(const char *name, void *arg, uint64_t offset,
struct stat *st, uint32_t mask,
uint32_t flags);

4
src/test/librgw_file.cc
View File

@ -73,7 +73,7 @@ TEST(LibRGW, GETATTR_ROOT) {
}
extern "C" {
static bool r1_cb(const char* name, void *arg, uint64_t offset,
static int r1_cb(const char* name, void *arg, uint64_t offset,
struct stat* st, uint32_t st_mask,
uint32_t flags) {
// don't need arg--it would point to fids1
@ -137,7 +137,7 @@ TEST(LibRGW, GETATTR_BUCKETS) {
}
extern "C" {
static bool r2_cb(const char* name, void *arg, uint64_t offset,
static int r2_cb(const char* name, void *arg, uint64_t offset,
struct stat* st, uint32_t st_mask,
uint32_t flags) {
std::vector<fid_type>& obj_vector = *(static_cast<std::vector<fid_type>*>(arg));

2
src/test/librgw_file_gp.cc
View File

@ -213,7 +213,7 @@ TEST(LibRGW, LOOKUP_BUCKET) {
}
extern "C" {
static bool r2_cb(const char* name, void *arg, uint64_t offset,
static int r2_cb(const char* name, void *arg, uint64_t offset,
struct stat *st, uint32_t st_mask,
uint32_t flags) {
// don't need arg--it would point to fids

2
src/test/librgw_file_marker.cc
View File

@ -292,7 +292,7 @@ TEST(LibRGW, MARKER1_SETUP_OBJECTS)
}
extern "C" {
static bool r2_cb(const char* name, void *arg, uint64_t offset,
static int r2_cb(const char* name, void *arg, uint64_t offset,
struct stat* st, uint32_t st_mask,
uint32_t flags) {
dirent_vec& dvec =

4
src/test/librgw_file_nfsns.cc
View File

@ -873,7 +873,7 @@ TEST(LibRGW, RELEASE_DIRS1) {
}
extern "C" {
static bool r1_cb(const char* name, void *arg, uint64_t offset,
static int r1_cb(const char* name, void *arg, uint64_t offset,
struct stat* st, uint32_t st_mask,
uint32_t flags) {
struct rgw_file_handle* parent_fh
@ -1031,7 +1031,7 @@ TEST(LibRGW, MARKER1_SETUP_OBJECTS)
}
extern "C" {
static bool r2_cb(const char* name, void *arg, uint64_t offset,
static int r2_cb(const char* name, void *arg, uint64_t offset,
struct stat* st, uint32_t st_mask,
uint32_t flags) {
dirent_vec& dvec =