NOISSUE reformat MeshMC to new clang format rules and fixed macOS portability issue and java find issue

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

1 files changed, 54 insertions, 56 deletions

diff --git a/libraries/LocalPeer/src/LockedFile_unix.cpp b/libraries/LocalPeer/src/LockedFile_unix.cpp
index 9f8142844e..10041c0f80 100644
--- a/libraries/LocalPeer/src/LockedFile_unix.cpp
+++ b/libraries/LocalPeer/src/LockedFile_unix.cpp
@@ -47,68 +47,66 @@
 
 bool LockedFile::lock(LockMode mode, bool block)
 {
-    if (!isOpen()) {
-        qWarning("QtLockedFile::lock(): file is not opened");
-        return false;
-    }
-
-    if (mode == NoLock)
-        return unlock();
-
-    if (mode == m_lock_mode)
-        return true;
-
-    if (m_lock_mode != NoLock)
-        unlock();
-
-    struct flock fl;
-    fl.l_whence = SEEK_SET;
-    fl.l_start = 0;
-    fl.l_len = 0;
-    fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK;
-    int cmd = block ? F_SETLKW : F_SETLK;
-    int ret = fcntl(handle(), cmd, &fl);
-
-    if (ret == -1) {
-        if (errno != EINTR && errno != EAGAIN)
-            qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
-        return false;
-    }
-
-
-    m_lock_mode = mode;
-    return true;
+	if (!isOpen()) {
+		qWarning("QtLockedFile::lock(): file is not opened");
+		return false;
+	}
+
+	if (mode == NoLock)
+		return unlock();
+
+	if (mode == m_lock_mode)
+		return true;
+
+	if (m_lock_mode != NoLock)
+		unlock();
+
+	struct flock fl;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK;
+	int cmd = block ? F_SETLKW : F_SETLK;
+	int ret = fcntl(handle(), cmd, &fl);
+
+	if (ret == -1) {
+		if (errno != EINTR && errno != EAGAIN)
+			qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
+		return false;
+	}
+
+	m_lock_mode = mode;
+	return true;
 }
 
-
 bool LockedFile::unlock()
 {
-    if (!isOpen()) {
-        qWarning("QtLockedFile::unlock(): file is not opened");
-        return false;
-    }
-
-    if (!isLocked())
-        return true;
-
-    struct flock fl;
-    fl.l_whence = SEEK_SET;
-    fl.l_start = 0;
-    fl.l_len = 0;
-    fl.l_type = F_UNLCK;
-    int ret = fcntl(handle(), F_SETLKW, &fl);
-
-    if (ret == -1) {
-        qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
-        return false;
-    }
-
-    m_lock_mode = NoLock;
-    return true;
+	if (!isOpen()) {
+		qWarning("QtLockedFile::unlock(): file is not opened");
+		return false;
+	}
+
+	if (!isLocked())
+		return true;
+
+	struct flock fl;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_type = F_UNLCK;
+	int ret = fcntl(handle(), F_SETLKW, &fl);
+
+	if (ret == -1) {
+		qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
+		return false;
+	}
+
+	m_lock_mode = NoLock;
+	return true;
 }
 
 LockedFile::~LockedFile()
 {
-    if (isOpen())
-        unlock();
+	if (isOpen())
+		unlock();
 }