1 files changed, 38 insertions, 42 deletions

diff --git a/core/ring_buffer.h b/core/ring_buffer.h
index e10cb8b5f8..6b71d12cf3 100644
--- a/core/ring_buffer.h
+++ b/core/ring_buffer.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RINGBUFFER_H
-#define RINGBUFFER_H
+#ifndef RING_BUFFER_H
+#define RING_BUFFER_H
 
 #include "core/vector.h"
 
 template <typename T>
 class RingBuffer {
-
 	Vector<T> data;
-	int read_pos;
-	int write_pos;
+	int read_pos = 0;
+	int write_pos = 0;
 	int size_mask;
 
 	inline int inc(int &p_var, int p_size) const {
@@ -46,13 +45,13 @@ class RingBuffer {
 		p_var += p_size;
 		p_var = p_var & size_mask;
 		return ret;
-	};
+	}
 
 public:
 	T read() {
 		ERR_FAIL_COND_V(space_left() < 1, T());
 		return data.ptr()[inc(read_pos, 1)];
-	};
+	}
 
 	int read(T *p_buf, int p_size, bool p_advance = true) {
 		int left = data_left();
@@ -67,23 +66,23 @@ public:
 			const T *read = data.ptr();
 			for (int i = 0; i < total; i++) {
 				p_buf[dst++] = read[pos + i];
-			};
+			}
 			to_read -= total;
 			pos = 0;
-		};
+		}
 		if (p_advance) {
 			inc(read_pos, p_size);
-		};
+		}
 		return p_size;
-	};
+	}
 
 	int copy(T *p_buf, int p_offset, int p_size) const {
-
 		int left = data_left();
 		if ((p_offset + p_size) > left) {
 			p_size -= left - p_offset;
-			if (p_size <= 0)
+			if (p_size <= 0) {
 				return 0;
+			}
 		}
 		p_size = MIN(left, p_size);
 		int pos = read_pos;
@@ -96,20 +95,20 @@ public:
 			int total = end - pos;
 			for (int i = 0; i < total; i++) {
 				p_buf[dst++] = data[pos + i];
-			};
+			}
 			to_read -= total;
 			pos = 0;
-		};
+		}
 		return p_size;
-	};
+	}
 
 	int find(const T &t, int p_offset, int p_max_size) const {
-
 		int left = data_left();
 		if ((p_offset + p_max_size) > left) {
 			p_max_size -= left - p_offset;
-			if (p_max_size <= 0)
+			if (p_max_size <= 0) {
 				return 0;
+			}
 		}
 		p_max_size = MIN(left, p_max_size);
 		int pos = read_pos;
@@ -120,9 +119,10 @@ public:
 			end = MIN(end, size());
 			int total = end - pos;
 			for (int i = 0; i < total; i++) {
-				if (data[pos + i] == t)
+				if (data[pos + i] == t) {
 					return i + (p_max_size - to_read);
-			};
+				}
+			}
 			to_read -= total;
 			pos = 0;
 		}
@@ -133,7 +133,7 @@ public:
 		p_n = MIN(p_n, data_left());
 		inc(read_pos, p_n);
 		return p_n;
-	};
+	}
 
 	inline int decrease_write(int p_n) {
 		p_n = MIN(p_n, data_left());
@@ -145,10 +145,9 @@ public:
 		ERR_FAIL_COND_V(space_left() < 1, FAILED);
 		data.write[inc(write_pos, 1)] = p_v;
 		return OK;
-	};
+	}
 
 	int write(const T *p_buf, int p_size) {
-
 		int left = space_left();
 		p_size = MIN(left, p_size);
 
@@ -156,39 +155,38 @@ public:
 		int to_write = p_size;
 		int src = 0;
 		while (to_write) {
-
 			int end = pos + to_write;
 			end = MIN(end, size());
 			int total = end - pos;
 
 			for (int i = 0; i < total; i++) {
 				data.write[pos + i] = p_buf[src++];
-			};
+			}
 			to_write -= total;
 			pos = 0;
-		};
+		}
 
 		inc(write_pos, p_size);
 		return p_size;
-	};
+	}
 
 	inline int space_left() const {
 		int left = read_pos - write_pos;
 		if (left < 0) {
 			return size() + left - 1;
-		};
+		}
 		if (left == 0) {
 			return size() - 1;
-		};
+		}
 		return left - 1;
-	};
+	}
 	inline int data_left() const {
 		return size() - space_left() - 1;
-	};
+	}
 
 	inline int size() const {
 		return data.size();
-	};
+	}
 
 	inline void clear() {
 		read_pos = 0;
@@ -203,22 +201,20 @@ public:
 		if (old_size < new_size && read_pos > write_pos) {
 			for (int i = 0; i < write_pos; i++) {
 				data.write[(old_size + i) & mask] = data[i];
-			};
+			}
 			write_pos = (old_size + write_pos) & mask;
 		} else {
 			read_pos = read_pos & mask;
 			write_pos = write_pos & mask;
-		};
+		}
 
 		size_mask = mask;
-	};
+	}
 
 	RingBuffer<T>(int p_power = 0) {
-		read_pos = 0;
-		write_pos = 0;
 		resize(p_power);
-	};
-	~RingBuffer<T>(){};
+	}
+	~RingBuffer<T>() {}
 };
 
-#endif
+#endif // RING_BUFFER_H