From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001
From: Rémi Verschelde
Date: Sun, 19 Mar 2017 00:36:26 +0100
Subject: Bring that Whole New World to the Old Continent too

Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
---
 core/ring_buffer.h | 52 +++++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

(limited to 'core/ring_buffer.h')

diff --git a/core/ring_buffer.h b/core/ring_buffer.h
index a4da0086e..3c13cb8d1 100644
--- a/core/ring_buffer.h
+++ b/core/ring_buffer.h
@@ -39,31 +39,30 @@ class RingBuffer {
 	int write_pos;
 	int size_mask;
 
-	inline int inc(int& p_var, int p_size) {
+	inline int inc(int &p_var, int p_size) {
 		int ret = p_var;
 		p_var += p_size;
-		p_var = p_var&size_mask;
+		p_var = p_var & size_mask;
 		return ret;
 	};
 
 public:
-
 	T read() {
 		ERR_FAIL_COND_V(space_left() < 1, T());
 		return data[inc(read_pos, 1)];
 	};
 
-	int read(T* p_buf, int p_size, bool p_advance=true) {
+	int read(T *p_buf, int p_size, bool p_advance = true) {
 		int left = data_left();
 		p_size = MIN(left, p_size);
 		int pos = read_pos;
 		int to_read = p_size;
 		int dst = 0;
-		while(to_read) {
+		while (to_read) {
 			int end = pos + to_read;
 			end = MIN(end, size());
 			int total = end - pos;
-			for (int i=0; i<total; i++) {
+			for (int i = 0; i < total; i++) {
 				p_buf[dst++] = data[pos + i];
 			};
 			to_read -= total;
@@ -75,24 +74,24 @@ public:
 		return p_size;
 	};
 
-	int copy(T* p_buf, int p_offset, int p_size) {
+	int copy(T *p_buf, int p_offset, int p_size) {
 
 		int left = data_left();
-		if ((p_offset+p_size)>left) {
-			p_size-=left-p_offset;
-			if (p_size<=0)
+		if ((p_offset + p_size) > left) {
+			p_size -= left - p_offset;
+			if (p_size <= 0)
 				return 0;
 		}
 		p_size = MIN(left, p_size);
 		int pos = read_pos;
-		inc(pos,p_offset);
+		inc(pos, p_offset);
 		int to_read = p_size;
 		int dst = 0;
-		while(to_read) {
+		while (to_read) {
 			int end = pos + to_read;
 			end = MIN(end, size());
 			int total = end - pos;
-			for (int i=0; i<total; i++) {
+			for (int i = 0; i < total; i++) {
 				p_buf[dst++] = data[pos + i];
 			};
 			to_read -= total;
@@ -107,13 +106,13 @@ public:
 		return p_n;
 	};
 
-	Error write(const T& p_v) {
-		ERR_FAIL_COND_V( space_left() < 1, FAILED);
+	Error write(const T &p_v) {
+		ERR_FAIL_COND_V(space_left() < 1, FAILED);
 		data[inc(write_pos, 1)] = p_v;
 		return OK;
 	};
 
-	int write(const T* p_buf, int p_size) {
+	int write(const T *p_buf, int p_size) {
 
 		int left = space_left();
 		p_size = MIN(left, p_size);
@@ -127,8 +126,8 @@ public:
 			end = MIN(end, size());
 			int total = end - pos;
 
-			for (int i=0; i<total; i++) {
-				data[pos+i] = p_buf[src++];
+			for (int i = 0; i < total; i++) {
+				data[pos + i] = p_buf[src++];
 			};
 			to_write -= total;
 			pos = 0;
@@ -144,9 +143,9 @@ public:
 			return size() + left - 1;
 		};
 		if (left == 0) {
-			return size()-1;
+			return size() - 1;
 		};
-		return left -1;
+		return left - 1;
 	};
 	inline int data_left() {
 		return size() - space_left() - 1;
@@ -159,17 +158,16 @@ public:
 	inline void clear() {
 		read_pos = 0;
 		write_pos = 0;
-
 	}
 
 	void resize(int p_power) {
 		int old_size = size();
-		int new_size = 1<<p_power;
+		int new_size = 1 << p_power;
 		int mask = new_size - 1;
-		data.resize(1<<p_power);
+		data.resize(1 << p_power);
 		if (old_size < new_size && read_pos > write_pos) {
-			for (int i=0; i<write_pos; i++) {
-				data[(old_size + i)&mask] = data[i];
+			for (int i = 0; i < write_pos; i++) {
+				data[(old_size + i) & mask] = data[i];
 			};
 			write_pos = (old_size + write_pos) & mask;
 		} else {
@@ -180,12 +178,12 @@ public:
 		size_mask = mask;
 	};
 
-	RingBuffer<T>(int p_power=0) {
+	RingBuffer<T>(int p_power = 0) {
 		read_pos = 0;
 		write_pos = 0;
 		resize(p_power);
 	};
-	~RingBuffer<T>() {};
+	~RingBuffer<T>(){};
 };
 
 #endif
-- 
cgit v1.3.1