summaryrefslogtreecommitdiffhomepage
path: root/test/fuse/linux
diff options
context:
space:
mode:
authorAndrei Vagin <avagin@google.com>2020-09-15 13:31:40 -0700
committerAndrei Vagin <avagin@gmail.com>2020-09-16 12:22:17 -0700
commit92a020c798fe237fb7038f3da71f24c5a88bb744 (patch)
tree7d7c3b1318ee921657d605276d522dfdf023ed96 /test/fuse/linux
parentf148242abab1ff043428036ccaf464de98268863 (diff)
fuse: fix a compile time error
readdir_test.cc:134:24: error: variable length arrays are a C99 feature [-Werror,-Wvla-extension] char readdir_payload[readdir_payload_size];
Diffstat (limited to 'test/fuse/linux')
-rw-r--r--test/fuse/linux/readdir_test.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/fuse/linux/readdir_test.cc b/test/fuse/linux/readdir_test.cc
index 17fb630ee..ed11e2ec9 100644
--- a/test/fuse/linux/readdir_test.cc
+++ b/test/fuse/linux/readdir_test.cc
@@ -131,7 +131,8 @@ TEST_F(ReaddirTest, SingleEntry) {
// Create an appropriately sized payload.
size_t readdir_payload_size =
test_file_dirent_size + dot_file_dirent_size + dot_dot_file_dirent_size;
- char readdir_payload[readdir_payload_size];
+ std::vector<char> readdir_payload_vec(readdir_payload_size);
+ char *readdir_payload = readdir_payload_vec.data();
fill_fuse_dirent(readdir_payload, dot.c_str());
fill_fuse_dirent(readdir_payload + dot_file_dirent_size, dot_dot.c_str());
@@ -139,10 +140,8 @@ TEST_F(ReaddirTest, SingleEntry) {
readdir_payload + dot_file_dirent_size + dot_dot_file_dirent_size,
test_file.c_str());
- std::vector<char> readdir_payload_vec(readdir_payload,
- readdir_payload + readdir_payload_size);
struct fuse_out_header readdir_header = {
- .len = uint32_t(sizeof(struct fuse_out_header) + sizeof(readdir_payload)),
+ .len = uint32_t(sizeof(struct fuse_out_header) + readdir_payload_size),
};
struct fuse_out_header readdir_header_break = {
.len = uint32_t(sizeof(struct fuse_out_header)),
@@ -185,4 +184,4 @@ TEST_F(ReaddirTest, SingleEntry) {
} // namespace
} // namespace testing
-} // namespace gvisor \ No newline at end of file
+} // namespace gvisor