clang-format clean

Author: Bamcane

src/base/system.c

@@ -65,8 +65,8 @@
 #error NEED C11 TO COMPILE
 #endif
 
-#include <stdatomic.h>
 #include <base/c11/threads.h>
+#include <stdatomic.h>
 
 IOHANDLE io_stdin() { return (IOHANDLE) stdin; }
 IOHANDLE io_stdout() { return (IOHANDLE) stdout; }
@@ -928,14 +928,14 @@ void thread_detach(void *thread)
 unsigned get_hardware_concurrency()
 {
 #if defined(CONF_FAMILY_WINDOWS)
-    SYSTEM_INFO sysinfo;
-    GetSystemInfo(&sysinfo);
-    return (unsigned) sysinfo.dwNumberOfProcessors; 
+	SYSTEM_INFO sysinfo;
+	GetSystemInfo(&sysinfo);
+	return (unsigned) sysinfo.dwNumberOfProcessors;
 #elif defined(CONF_FAMILY_UNIX)
-    long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
+	long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
 	if(nprocs < 0)
 		return 0;
-    return (unsigned) nprocs;
+	return (unsigned) nprocs;
 #else
 #error NOT IMPLEMENTED
 #endif

src/base/system.h

@@ -590,8 +590,8 @@ void thread_detach(void *thread);
 
 /*
 	Function: get_hardware_concurrency
-        A implementation equivalent to std::thread::hardware_concurrency() (C++11).
-    	Returns a value that hints at the number of hardware thread contexts.
+	A implementation equivalent to std::thread::hardware_concurrency() (C++11).
+	Returns a value that hints at the number of hardware thread contexts.
 */
 unsigned get_hardware_concurrency();
 

src/base/tl/stream.h

@@ -7,94 +7,96 @@
 class stream
 {
 public:
-    stream() {};
-    virtual ~stream() {};
+	stream() {};
+	virtual ~stream() {};
 
-    virtual unsigned write(const unsigned char *buffer, unsigned size) = 0;
-    virtual unsigned write_newline() = 0;
+	virtual unsigned write(const unsigned char *buffer, unsigned size) = 0;
+	virtual unsigned write_newline() = 0;
 };
 
 class file_stream : public stream
 {
-    IOHANDLE file;
-    bool auto_io_close;
+	IOHANDLE file;
+	bool auto_io_close;
+
 public:
-    file_stream(IOHANDLE handle, bool auto_close)
-    {
-        file = handle;
-        auto_io_close = auto_close;
-    }
-
-    virtual ~file_stream()
-    {
-        io_close(file);
-    }
-    
-    virtual unsigned write(const unsigned char *buffer, unsigned size)
-    {
-        return io_write(file, buffer, size);
-    }
-
-    virtual unsigned write_newline()
-    {
-        return io_write_newline(file);
-    }
+	file_stream(IOHANDLE handle, bool auto_close)
+	{
+		file = handle;
+		auto_io_close = auto_close;
+	}
+
+	virtual ~file_stream()
+	{
+		io_close(file);
+	}
+
+	virtual unsigned write(const unsigned char *buffer, unsigned size)
+	{
+		return io_write(file, buffer, size);
+	}
+
+	virtual unsigned write_newline()
+	{
+		return io_write_newline(file);
+	}
 };
 
 class inplace_memory_stream : public stream
 {
-    unsigned char *start;
-    unsigned char *end;
+	unsigned char *start;
+	unsigned char *end;
+
 public:
-    inplace_memory_stream(unsigned char *memory, unsigned size)
-    {
-        start = memory;
-        end = start + size;
-    }
-
-    virtual unsigned write(const unsigned char *buffer, unsigned size)
-    {
-        if(start + size > end)
-            return 0;
-        mem_copy(start, buffer, size);
-        return size;
-    }
-
-    virtual unsigned write_newline()
-    {
-        if(start >= end)
-            return 0;
-        *start = '\n';
-        start++;
-        return 1;
-    }
+	inplace_memory_stream(unsigned char *memory, unsigned size)
+	{
+		start = memory;
+		end = start + size;
+	}
+
+	virtual unsigned write(const unsigned char *buffer, unsigned size)
+	{
+		if(start + size > end)
+			return 0;
+		mem_copy(start, buffer, size);
+		return size;
+	}
+
+	virtual unsigned write_newline()
+	{
+		if(start >= end)
+			return 0;
+		*start = '\n';
+		start++;
+		return 1;
+	}
 };
 
 template<class T>
 class memory_stream : public stream
 {
-    static_assert(sizeof(T) == 1, "the size of buffer element should be 1 byte");
-    array<T> *mem_buffer;
+	static_assert(sizeof(T) == 1, "the size of buffer element should be 1 byte");
+	array<T> *mem_buffer;
+
 public:
-    memory_stream(array<T> *buffer)
-    {
-        mem_buffer = buffer;
-        buffer->clear();
-    }
-
-    virtual unsigned write(const unsigned char *buffer, unsigned size)
-    {
-        unsigned start = mem_buffer->size();
-        mem_buffer->set_size(start + size);
-        inplace_memory_stream stream((unsigned char *) mem_buffer->base_ptr() + start, size);
-        return stream.write(buffer, size);
-    }
-
-    virtual unsigned write_newline()
-    {
-        return write((const unsigned char *)("\n"), 1);
-    }
-};
+	memory_stream(array<T> *buffer)
+	{
+		mem_buffer = buffer;
+		buffer->clear();
+	}
 
+	virtual unsigned write(const unsigned char *buffer, unsigned size)
+	{
+		unsigned start = mem_buffer->size();
+		mem_buffer->set_size(start + size);
+		inplace_memory_stream stream((unsigned char *) mem_buffer->base_ptr() + start, size);
+		return stream.write(buffer, size);
+	}
+
+	virtual unsigned write_newline()
+	{
+		return write((const unsigned char *) ("\n"), 1);
+	}
+};
 
-#endif // BASE_TL_STREAM_H
+#endif // BASE_TL_STREAM_H

src/engine/client/client.cpp

@@ -1757,7 +1757,7 @@ void CClient::VersionUpdate()
 					const char *pVersion = (*pJsonData)["version"];
 					bool VersionMatch = str_comp(GAME_RELEASE_VERSION, pVersion) == 0;
 
-					char aBuf[256]; 
+					char aBuf[256];
 					str_format(aBuf, sizeof(aBuf), "version does %s (%s)",
 						VersionMatch ? "match" : "NOT match",
 						pVersion);

src/engine/client/serverbrowser.cpp

@@ -697,7 +697,7 @@ void CServerBrowser::SaveServerlist()
 	IOHANDLE File = Storage()->OpenFile(s_pFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
 	if(!File)
 		return;
-	
+
 	file_stream Stream(File, true);
 	CJsonWriter Writer(&Stream);
 	Writer.BeginObject(); // root

src/engine/shared/filecollection.cpp

@@ -12,7 +12,7 @@ bool CFileCollection::IsFilenameValid(const char *pFilename, int64 *pTimestamp)
 {
 	if(!str_endswith(pFilename, m_aFileExt))
 		return false;
-	
+
 	if(m_aFileDesc[0] == '\0')
 	{
 		int FilenameLength = str_length(pFilename);
@@ -174,7 +174,7 @@ int CFileCollection::FilelistCallback(const char *pFilename, int IsDir, int Stor
 		return 0;
 
 	// add the entry
- 	CEntry &Entry = pThis->m_aEntries.emplace();
+	CEntry &Entry = pThis->m_aEntries.emplace();
 	Entry.m_Timestamp = Timestamp;
 	str_copy(Entry.m_aFilename, pFilename, sizeof(Entry.m_aFilename));
 

src/engine/shared/filecollection.h

@@ -17,7 +17,7 @@ class CFileCollection
 	{
 		int64 m_Timestamp;
 		char m_aFilename[IO_MAX_PATH_LENGTH];
-	
+
 		inline bool operator<(const CEntry &Other) const { return m_Timestamp < Other.m_Timestamp; }
 	};