mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

KeyValueStringParse closer to beta version (#656)

Browse Source 
* KeyValueStringParse closer to beta version

* Line numbers out
This commit is contained in:
MS
2024-03-12 14:27:24 -04:00
committed by GitHub
parent 9d80cf4824
commit 62a3f50287
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
LEGO1/omni/src/common/mxutilities.cpp
View File

@@ -9,6 +9,8 @@
#include "mxpresenterlist.h" #include "mxpresenterlist.h"
#include "mxrect32.h" #include "mxrect32.h"
#include <assert.h>
// GLOBAL: LEGO1 0x101020e8 // GLOBAL: LEGO1 0x101020e8
void (*g_omniUserMessage)(const char*, int) = NULL; void (*g_omniUserMessage)(const char*, int) = NULL;
@@ -78,39 +80,37 @@ void MakeSourceName(char* p_output, const char* p_input)
} }
// FUNCTION: LEGO1 0x100b7050 // FUNCTION: LEGO1 0x100b7050
MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p_source) MxBool KeyValueStringParse(char* p_output, const char* p_command, const char* p_string)
{ {
MxBool didMatch = FALSE; MxBool didMatch = FALSE;
assert(p_string);
assert(p_command);
MxS16 len = strlen(p_source); MxS16 len = strlen(p_string);
char* temp = new char[len + 1]; char* string = new char[len + 1];
strcpy(temp, p_source); assert(string);
strcpy(string, p_string);
char* token = strtok(temp, ", \t\r\n:"); for (char* token = strtok(string, ", \t\r\n:"); token; token = strtok(NULL, ", \t\r\n:")) {
while (token) {
len -= (strlen(token) + 1); len -= (strlen(token) + 1);
if (strcmpi(token, p_key) == 0) { if (strcmpi(token, p_command) == 0) {
if (p_outputValue && len > 0) { if (p_output && len > 0) {
char* cur = &token[strlen(p_key)]; char* output = p_output;
char* cur = &token[strlen(p_command)];
cur++; cur++;
while (*cur != ',') { while (*cur != ',' && *cur != ' ' && *cur != '\0' && *cur != '\t' && *cur != '\n' && *cur != '\r') {
if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r') { *output++ = *cur++;
break;
}
*p_outputValue++ = *cur++;
} }
*p_outputValue = '\0'; *output = '\0';
} }
didMatch = TRUE; didMatch = TRUE;
break; break;
} }
token = strtok(NULL, ", \t\r\n:");
} }
delete[] temp; delete[] string;
return didMatch; return didMatch;
} }