UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a number of memory complaints from valgrind. most of these were minor, but there was a rather disturbing memory over-read error in the SMC text parser. correcting this brought about a rewrite of its API. this change is BACKWARDS INCOMPATIBLE for C++ extensions, but it was sorely needed, and the API is now both future-extensible and much easier to work with. plugins didn't need any changes, but they will probably get the better API changes in a future release. as a special bonus, the RawLine() hook is now much less expensive since the entire stream buffer won't be shoved through it like before!

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401662
This commit is contained in:
David Anderson
2007-10-31 05:04:07 +00:00
parent e425558f3f
commit 172f28d676
19 changed files with 516 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/topmenus/TopMenu.cpp
+11 -11
View File
@@ -895,11 +895,11 @@ void TopMenu::TearDownClient(topmenu_player_t *player)
bool TopMenu::LoadConfiguration(const char *file, char *error, size_t maxlength)
{
SMCParseError err;
unsigned int line = 0, col = 0;
SMCError err;
SMCStates states;
if ((err = textparsers->ParseFile_SMC(file, this, &line, &col))
!= SMCParse_Okay)
if ((err = textparsers->ParseFile_SMC(file, this, &states))
!= SMCError_Okay)
{
const char *err_string = textparsers->GetSMCErrorString(err);
if (!err_string)
@@ -971,7 +971,7 @@ void TopMenu::ReadSMC_ParseStart()
m_Config.cats.clear();
}
SMCParseResult TopMenu::ReadSMC_NewSection(const char *name, bool opt_quotes)
SMCResult TopMenu::ReadSMC_NewSection(const SMCStates *states, const char *name)
{
if (ignore_parse_level)
{
@@ -1003,16 +1003,16 @@ SMCParseResult TopMenu::ReadSMC_NewSection(const char *name, bool opt_quotes)
}
}
return SMCParse_Continue;
return SMCResult_Continue;
}
SMCParseResult TopMenu::ReadSMC_KeyValue(const char *key, const char *value, bool key_quotes, bool value_quotes)
SMCResult TopMenu::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
{
if (ignore_parse_level > 0
|| current_parse_state != PARSE_STATE_CATEGORY
|| cur_cat == NULL)
{
return SMCParse_Continue;
return SMCResult_Continue;
}
if (strcmp(key, "item") == 0)
@@ -1020,10 +1020,10 @@ SMCParseResult TopMenu::ReadSMC_KeyValue(const char *key, const char *value, boo
cur_cat->commands.push_back(m_Config.strings.AddString(value));
}
return SMCParse_Continue;
return SMCResult_Continue;
}
SMCParseResult TopMenu::ReadSMC_LeavingSection()
SMCResult TopMenu::ReadSMC_LeavingSection(const SMCStates *states)
{
if (ignore_parse_level)
{
@@ -1042,7 +1042,7 @@ SMCParseResult TopMenu::ReadSMC_LeavingSection()
}
}
return SMCParse_Continue;
return SMCResult_Continue;
}
unsigned int TopMenu::FindCategory(const char *name)
extensions/topmenus/TopMenu.h
+4 -7
View File
@@ -141,13 +141,10 @@ public: //IMenuHandler
const ItemDrawInfo &dr);
virtual void OnMenuCancel(IBaseMenu *menu, int client, MenuCancelReason reason);
public: //ITextListener_SMC
virtual void ReadSMC_ParseStart();
SMCParseResult ReadSMC_NewSection(const char *name, bool opt_quotes);
SMCParseResult ReadSMC_KeyValue(const char *key,
const char *value,
bool key_quotes,
bool value_quotes);
SMCParseResult ReadSMC_LeavingSection();
void ReadSMC_ParseStart();
SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
SMCResult ReadSMC_LeavingSection(const SMCStates *states);
private:
void SortCategoriesIfNeeded();
void SortCategoryIfNeeded(unsigned int category);