@@ -134,28 +134,28 @@ void test_read_dir()
134
134
err = dir.open (&fs, " test_read_dir" );
135
135
TEST_ASSERT_EQUAL (0 , err);
136
136
137
- struct dirent * de;
137
+ struct dirent de;
138
138
bool test_dir_found = false ;
139
139
bool test_file_found = true ;
140
140
141
- while ((de = readdir (&dir)) ) {
142
- printf (" d_name: %.32s, d_type: %x\n " , de-> d_name , de-> d_type );
141
+ while (dir. read (&de) == 1 ) {
142
+ printf (" d_name: %.32s, d_type: %x\n " , de. d_name , de. d_type );
143
143
144
- if (strcmp (de-> d_name , " ." ) == 0 ) {
144
+ if (strcmp (de. d_name , " ." ) == 0 ) {
145
145
test_dir_found = true ;
146
- TEST_ASSERT_EQUAL (DT_DIR, de-> d_type );
147
- } else if (strcmp (de-> d_name , " .." ) == 0 ) {
146
+ TEST_ASSERT_EQUAL (DT_DIR, de. d_type );
147
+ } else if (strcmp (de. d_name , " .." ) == 0 ) {
148
148
test_dir_found = true ;
149
- TEST_ASSERT_EQUAL (DT_DIR, de-> d_type );
150
- } else if (strcmp (de-> d_name , " test_dir" ) == 0 ) {
149
+ TEST_ASSERT_EQUAL (DT_DIR, de. d_type );
150
+ } else if (strcmp (de. d_name , " test_dir" ) == 0 ) {
151
151
test_dir_found = true ;
152
- TEST_ASSERT_EQUAL (DT_DIR, de-> d_type );
153
- } else if (strcmp (de-> d_name , " test_file" ) == 0 ) {
152
+ TEST_ASSERT_EQUAL (DT_DIR, de. d_type );
153
+ } else if (strcmp (de. d_name , " test_file" ) == 0 ) {
154
154
test_file_found = true ;
155
- TEST_ASSERT_EQUAL (DT_REG, de-> d_type );
155
+ TEST_ASSERT_EQUAL (DT_REG, de. d_type );
156
156
} else {
157
157
char *buf = new char [NAME_MAX];
158
- snprintf (buf, NAME_MAX, " Unexpected file \" %s\" " , de-> d_name );
158
+ snprintf (buf, NAME_MAX, " Unexpected file \" %s\" " , de. d_name );
159
159
TEST_ASSERT_MESSAGE (false , buf);
160
160
}
161
161
}
0 commit comments