Fix some of the things clang --analyze flagged
This commit is contained in:
1 parent
352cd151e0
commit
98360bcd57
34 files changed
+58
-112
No files matched your search
@@ -673,7 +673,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
|
||||
else if (!strcmp(token.string, "["))
|
||||
{
|
||||
size += sizeof(bot_synonymlist_t);
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
syn = (bot_synonymlist_t *) ptr;
|
||||
ptr += sizeof(bot_synonymlist_t);
|
||||
@@ -705,7 +705,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
|
||||
len = strlen(token.string) + 1;
|
||||
len = PAD(len, sizeof(long));
|
||||
size += sizeof(bot_synonym_t) + len;
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
synonym = (bot_synonym_t *) ptr;
|
||||
ptr += sizeof(bot_synonym_t);
|
||||
@@ -725,7 +725,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
|
||||
FreeSource(source);
|
||||
return NULL;
|
||||
} //end if
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
synonym->weight = token.floatvalue;
|
||||
syn->totalweight += synonym->weight;
|
||||
@@ -1003,7 +1003,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
|
||||
len = strlen(token.string) + 1;
|
||||
len = PAD(len, sizeof(long));
|
||||
size += sizeof(bot_randomlist_t) + len;
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
random = (bot_randomlist_t *) ptr;
|
||||
ptr += sizeof(bot_randomlist_t);
|
||||
@@ -1034,7 +1034,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
|
||||
len = strlen(chatmessagestring) + 1;
|
||||
len = PAD(len, sizeof(long));
|
||||
size += sizeof(bot_randomstring_t) + len;
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
randomstring = (bot_randomstring_t *) ptr;
|
||||
ptr += sizeof(bot_randomstring_t);
|
||||
@@ -2113,7 +2113,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
|
||||
return NULL;
|
||||
} //end if
|
||||
StripDoubleQuotes(token.string);
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
chattype = (bot_chattype_t *) ptr;
|
||||
strncpy(chattype->name, token.string, MAX_CHATTYPE_NAME);
|
||||
@@ -2136,7 +2136,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
|
||||
} //end if
|
||||
len = strlen(chatmessagestring) + 1;
|
||||
len = PAD(len, sizeof(long));
|
||||
if (pass)
|
||||
if (pass && ptr)
|
||||
{
|
||||
chatmessage = (bot_chatmessage_t *) ptr;
|
||||
chatmessage->time = -2*CHATMESSAGE_RECENTTIME;
|
||||
@@ -2583,7 +2583,6 @@ void BotInitialChat(int chatstate, char *type, int mcontext, char *var0, char *v
|
||||
strcat(match.string, var7);
|
||||
match.variables[7].offset = index;
|
||||
match.variables[7].length = strlen(var7);
|
||||
index += strlen(var7);
|
||||
}
|
||||
//
|
||||
BotConstructChatMessage(cs, message, mcontext, &match, 0, qfalse);
|
||||
@@ -2766,7 +2765,6 @@ int BotReplyChat(int chatstate, char *message, int mcontext, int vcontext, char
|
||||
strcat(bestmatch.string, var7);
|
||||
bestmatch.variables[7].offset = index;
|
||||
bestmatch.variables[7].length = strlen(var7);
|
||||
index += strlen(var7);
|
||||
}
|
||||
if (LibVarGetValue("bot_testrchat"))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user