diff --git a/source/devoptab/devoptab_fsa_dirnext.cpp b/source/devoptab/devoptab_fsa_dirnext.cpp
index f9eeaa7..07ba3ab 100644
--- a/source/devoptab/devoptab_fsa_dirnext.cpp
+++ b/source/devoptab/devoptab_fsa_dirnext.cpp
@@ -13,12 +13,11 @@ int __fsa_dirnext(struct _reent *r,
         return -1;
     }
 
-    auto *dir = (__fsa_dir_t *) (dirState->dirStruct);
-    memset(&dir->entry_data, 0, sizeof(dir->entry_data));
-
     auto *deviceData = (FSADeviceData *) r->deviceData;
+    auto *dir        = (__fsa_dir_t *) (dirState->dirStruct);
 
     std::lock_guard<MutexWrapper> lock(dir->mutex);
+    memset(&dir->entry_data, 0, sizeof(dir->entry_data));
 
     status = FSAReadDir(deviceData->clientHandle, dir->fd, &dir->entry_data);
     if (status < 0) {
diff --git a/source/devoptab/devoptab_fsa_fsync.cpp b/source/devoptab/devoptab_fsa_fsync.cpp
index 885a71e..3850391 100644
--- a/source/devoptab/devoptab_fsa_fsync.cpp
+++ b/source/devoptab/devoptab_fsa_fsync.cpp
@@ -11,8 +11,7 @@ int __fsa_fsync(struct _reent *r,
         return -1;
     }
 
-    auto *file = (__fsa_file_t *) fd;
-
+    auto *file       = (__fsa_file_t *) fd;
     auto *deviceData = (FSADeviceData *) r->deviceData;
 
     std::lock_guard<MutexWrapper> lock(file->mutex);
diff --git a/source/devoptab/devoptab_fsa_seek.cpp b/source/devoptab/devoptab_fsa_seek.cpp
index 69b0a6b..74b2bb5 100644
--- a/source/devoptab/devoptab_fsa_seek.cpp
+++ b/source/devoptab/devoptab_fsa_seek.cpp
@@ -15,8 +15,7 @@ off_t __fsa_seek(struct _reent *r,
         return -1;
     }
 
-    auto *file = (__fsa_file_t *) fd;
-
+    auto *file       = (__fsa_file_t *) fd;
     auto *deviceData = (FSADeviceData *) r->deviceData;
 
     std::lock_guard<MutexWrapper> lock(file->mutex);
diff --git a/source/devoptab/devoptab_fsa_truncate.cpp b/source/devoptab/devoptab_fsa_truncate.cpp
index 6c617d8..562ee72 100644
--- a/source/devoptab/devoptab_fsa_truncate.cpp
+++ b/source/devoptab/devoptab_fsa_truncate.cpp
@@ -13,8 +13,7 @@ int __fsa_ftruncate(struct _reent *r,
         return -1;
     }
 
-    auto *file = (__fsa_file_t *) fd;
-
+    auto *file       = (__fsa_file_t *) fd;
     auto *deviceData = (FSADeviceData *) r->deviceData;
 
     std::lock_guard<MutexWrapper> lock(file->mutex);