From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 16 Dec 2020 19:19:58 +0000 (+0000)
Subject: sys: Remove unnecessary curly braces from a commented out if statement
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4aa33d6d555de3c25f748ba78dc6d95bd54a83f9;p=xonotic%2Fdarkplaces.git

sys: Remove unnecessary curly braces from a commented out if statement

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@13065 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sys_sdl.c b/sys_sdl.c
index 982956b1..171e5c85 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -103,61 +103,58 @@ void Sys_PrintToTerminal(const char *text)
 
 char *Sys_ConsoleInput(void)
 {
-//	if (cls.state == ca_dedicated)
-	{
-		static char text[MAX_INPUTLINE];
-		int len = 0;
+	static char text[MAX_INPUTLINE];
+	int len = 0;
 #ifdef WIN32
-		int c;
+	int c;
 
-		// read a line out
-		while (_kbhit ())
+	// read a line out
+	while (_kbhit ())
+	{
+		c = _getch ();
+		_putch (c);
+		if (c == '\r')
 		{
-			c = _getch ();
-			_putch (c);
-			if (c == '\r')
+			text[len] = 0;
+			_putch ('\n');
+			len = 0;
+			return text;
+		}
+		if (c == 8)
+		{
+			if (len)
 			{
+				_putch (' ');
+				_putch (c);
+				len--;
 				text[len] = 0;
-				_putch ('\n');
-				len = 0;
-				return text;
-			}
-			if (c == 8)
-			{
-				if (len)
-				{
-					_putch (' ');
-					_putch (c);
-					len--;
-					text[len] = 0;
-				}
-				continue;
 			}
-			text[len] = c;
-			len++;
-			text[len] = 0;
-			if (len == sizeof (text))
-				len = 0;
+			continue;
 		}
+		text[len] = c;
+		len++;
+		text[len] = 0;
+		if (len == sizeof (text))
+			len = 0;
+	}
 #else
-		fd_set fdset;
-		struct timeval timeout;
-		FD_ZERO(&fdset);
-		FD_SET(0, &fdset); // stdin
-		timeout.tv_sec = 0;
-		timeout.tv_usec = 0;
-		if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+	fd_set fdset;
+	struct timeval timeout;
+	FD_ZERO(&fdset);
+	FD_SET(0, &fdset); // stdin
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 0;
+	if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+	{
+		len = read (0, text, sizeof(text));
+		if (len >= 1)
 		{
-			len = read (0, text, sizeof(text));
-			if (len >= 1)
-			{
-				// rip off the \n and terminate
-				text[len-1] = 0;
-				return text;
-			}
+			// rip off the \n and terminate
+			text[len-1] = 0;
+			return text;
 		}
-#endif
 	}
+#endif
 	return NULL;
 }
 
diff --git a/sys_unix.c b/sys_unix.c
index 031c55d8..f3ca3677 100644
--- a/sys_unix.c
+++ b/sys_unix.c
@@ -75,64 +75,61 @@ void Sys_PrintToTerminal(const char *text)
 
 char *Sys_ConsoleInput(void)
 {
-	//if (cls.state == ca_dedicated)
-	{
-		static char text[MAX_INPUTLINE];
-		static unsigned int len = 0;
+	static char text[MAX_INPUTLINE];
+	static unsigned int len = 0;
 #ifdef WIN32
-		int c;
+	int c;
 
-		// read a line out
-		while (_kbhit ())
+	// read a line out
+	while (_kbhit ())
+	{
+		c = _getch ();
+		if (c == '\r')
 		{
-			c = _getch ();
-			if (c == '\r')
-			{
-				text[len] = '\0';
-				_putch ('\n');
-				len = 0;
-				return text;
-			}
-			if (c == '\b')
-			{
-				if (len)
-				{
-					_putch (c);
-					_putch (' ');
-					_putch (c);
-					len--;
-				}
-				continue;
-			}
-			if (len < sizeof (text) - 1)
+			text[len] = '\0';
+			_putch ('\n');
+			len = 0;
+			return text;
+		}
+		if (c == '\b')
+		{
+			if (len)
 			{
 				_putch (c);
-				text[len] = c;
-				len++;
+				_putch (' ');
+				_putch (c);
+				len--;
 			}
+			continue;
 		}
+		if (len < sizeof (text) - 1)
+		{
+			_putch (c);
+			text[len] = c;
+			len++;
+		}
+	}
 #else
-		fd_set fdset;
-		struct timeval timeout;
-		FD_ZERO(&fdset);
-		FD_SET(0, &fdset); // stdin
-		timeout.tv_sec = 0;
-		timeout.tv_usec = 0;
-		if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+	fd_set fdset;
+	struct timeval timeout;
+	FD_ZERO(&fdset);
+	FD_SET(0, &fdset); // stdin
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 0;
+	if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+	{
+		len = read (0, text, sizeof(text) - 1);
+		if (len >= 1)
 		{
-			len = read (0, text, sizeof(text) - 1);
-			if (len >= 1)
-			{
-				// rip off the \n and terminate
-				// div0: WHY? console code can deal with \n just fine
-				// this caused problems with pasting stuff into a terminal window
-				// so, not ripping off the \n, but STILL keeping a NUL terminator
-				text[len] = 0;
-				return text;
-			}
+			// rip off the \n and terminate
+			// div0: WHY? console code can deal with \n just fine
+			// this caused problems with pasting stuff into a terminal window
+			// so, not ripping off the \n, but STILL keeping a NUL terminator
+			text[len] = 0;
+			return text;
 		}
-#endif
 	}
+#endif
 	return NULL;
 }