chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for-loop syntax to match style convention

Browse Source
This commit is contained in:
Kristian Hartikainen
2023-01-23 13:43:28 +00:00
parent 436fc6e77c
commit d35670932f
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_vfs.c
+1 -1
View File
@@ -179,7 +179,7 @@ int mj_deleteFileVFS(mjVFS* vfs, const char* filename) {
mju_free(vfs->filedata[i]); mju_free(vfs->filedata[i]);
// scroll remaining files forward // scroll remaining files forward
for (int j = i; j < vfs->nfile - 1; ++j) { for (int j=i; j<vfs->nfile-1; j++) {
mjSTRNCPY(vfs->filename[j], vfs->filename[j+1]); mjSTRNCPY(vfs->filename[j], vfs->filename[j+1]);
vfs->filesize[j] = vfs->filesize[j+1]; vfs->filesize[j] = vfs->filesize[j+1];
vfs->filedata[j] = vfs->filedata[j+1]; vfs->filedata[j] = vfs->filedata[j+1];
test/engine/engine_vfs_test.cc
+16 -2
View File
@@ -51,15 +51,29 @@ TEST_F(EngineVfsTest, AddFileVFS) {
EXPECT_THAT(mj_vfs->nfile, 0); EXPECT_THAT(mj_vfs->nfile, 0);
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file1.c_str()), 0); EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file1.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 1); EXPECT_THAT(mj_vfs->nfile, 1);
EXPECT_THAT(mj_vfs->filename[0], file1);
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file2.c_str()), 0); EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file2.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 2); EXPECT_THAT(mj_vfs->nfile, 2);
EXPECT_THAT(mj_vfs->filename[0], file1);
EXPECT_THAT(mj_vfs->filename[1], file2);
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file3.c_str()), 0); EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file3.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 3); EXPECT_THAT(mj_vfs->nfile, 3);
EXPECT_THAT(mj_vfs->filename[0], file1);
EXPECT_THAT(mj_vfs->filename[1], file2);
EXPECT_THAT(mj_vfs->filename[2], file3);
mj_deleteFileVFS(mj_vfs.get(), file1.c_str()); mj_deleteFileVFS(mj_vfs.get(), file1.c_str());
EXPECT_THAT(mj_vfs->nfile, 2); EXPECT_THAT(mj_vfs->nfile, 2);
mj_deleteFileVFS(mj_vfs.get(), file2.c_str()); EXPECT_THAT(mj_vfs->filename[0], file2);
EXPECT_THAT(mj_vfs->nfile, 1); EXPECT_THAT(mj_vfs->filename[1], file3);
mj_deleteFileVFS(mj_vfs.get(), file3.c_str()); mj_deleteFileVFS(mj_vfs.get(), file3.c_str());
EXPECT_THAT(mj_vfs->nfile, 1);
EXPECT_THAT(mj_vfs->filename[0], file2);
mj_deleteFileVFS(mj_vfs.get(), file2.c_str());
EXPECT_THAT(mj_vfs->nfile, 0); EXPECT_THAT(mj_vfs->nfile, 0);
mj_deleteVFS(mj_vfs.get()); mj_deleteVFS(mj_vfs.get());