Trunk sync r10722.

git-svn-id: svn://svn.icculus.org/fs2open/branches/fs2_open_3_7_2@10723 387891d4-d844-0410-90c0-e4c51a9137d3

code/debugconsole/consoleparse.cpp

@@ -517,12 +517,12 @@ int dc_required_string_either(char *str1, char *str2)
 	return i;
 }
 
-int dc_required_string_any(const uint n, ...)
+uint dc_required_string_any(const uint n, ...)
 {
 	va_list vl;
 	SCP_vector<SCP_string> strings;
 	const char *str_found = NULL;
-	int i;
+	uint i;
 
 	dc_ignore_gray_space();
 
@@ -599,7 +599,7 @@ bool dc_optional_string_either(const char *str1, const char *str2)
 
 void dc_parse_init(SCP_string &str)
 {
-	strcpy(Command_string, str.c_str());
+	strcpy_s(Command_string, str.c_str());
 	Cp = Command_string;
 }
 
@@ -1123,7 +1123,7 @@ void dc_stuff_ubyte(ubyte *i)
 	value_ul = dc_parse_ulong(Cp, DCT_UBYTE);
 
 	// Since some system's chars may be greater than 1 byte, we can't use UCHAR_MAX for a UBYTE
-	if ((value_ul <= 255) && (value_ul >= 0)) {
+	if (value_ul <= 255) {
 		*i = value_ul;
 
 	} else {
@@ -1231,7 +1231,7 @@ void dc_stuff_string(SCP_string &out_str)
 	}
 
 	// Bail if overflow
-	if ((count == out_str.max_size()) && (c_ptr != '\0')) {
+	if ((count == out_str.max_size()) && (*c_ptr != '\0')) {
 		throw errParse("SCP_string overflow!", DCT_STRING);
 	}