diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-09-13 18:56:06 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-09-13 18:56:06 +0200 |
| commit | e4d38fd7075144a937156fe202e715333a2fa8bb (patch) | |
| tree | 0a134f7dcbcacc3e12ca325d644a0588c524ba54 /src | |
| parent | 28e797f2f2b0fa7a718839711762a5bfd229095f (diff) | |
Fix gcc warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Chat/Hyperlinks.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/server/game/Chat/Hyperlinks.cpp b/src/server/game/Chat/Hyperlinks.cpp index fbc4a0c3995..7177c1427ef 100644 --- a/src/server/game/Chat/Hyperlinks.cpp +++ b/src/server/game/Chat/Hyperlinks.cpp @@ -145,7 +145,7 @@ struct LinkValidator<LinkTags::item> if (randomSuffix) { if (len > name.length() + 1 && - (strncmp(name.c_str(), pos, name.length()) == 0) && + (strncmp(name.c_str(), pos, name.length()) == 0) && (*(pos + name.length()) == ' ') && equal_with_len(randomSuffix[i], pos + name.length() + 1, len - name.length() - 1)) return true; @@ -286,25 +286,24 @@ struct LinkValidator<LinkTags::trade> } }; -#define TryValidateAs(tagname) \ -{ \ - using taginfo = typename LinkTags::tagname; \ - ASSERT(!strcmp(taginfo::tag(), #tagname)); \ - if (info.tag.second == strlen(taginfo::tag()) && \ - !strncmp(info.tag.first, taginfo::tag(), strlen(taginfo::tag()))) \ - { \ - advstd::remove_cvref_t<typename taginfo::value_type> t; \ - if (!taginfo::StoreTo(t, info.data.first, info.data.second)) \ - return false; \ - if (!LinkValidator<taginfo>::IsColorValid(t, info.color)) \ - return false; \ - if (sWorld->getIntConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY)) \ - if (!LinkValidator<taginfo>::IsTextValid(t, info.text.first, info.text.second)) \ - return false; \ - return true; \ - } \ +#define TryValidateAs(tagname) \ +{ \ + ASSERT(!strcmp(LinkTags::tagname::tag(), #tagname)); \ + if (info.tag.second == strlen(LinkTags::tagname::tag()) && \ + !strncmp(info.tag.first, LinkTags::tagname::tag(), strlen(LinkTags::tagname::tag()))) \ + { \ + advstd::remove_cvref_t<typename LinkTags::tagname::value_type> t; \ + if (!LinkTags::tagname::StoreTo(t, info.data.first, info.data.second)) \ + return false; \ + if (!LinkValidator<LinkTags::tagname>::IsColorValid(t, info.color)) \ + return false; \ + if (sWorld->getIntConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY)) \ + if (!LinkValidator<LinkTags::tagname>::IsTextValid(t, info.text.first, info.text.second)) \ + return false; \ + return true; \ + } \ } - + static bool ValidateLinkInfo(HyperlinkInfo const& info) { TryValidateAs(achievement); @@ -370,7 +369,7 @@ bool Trinity::Hyperlinks::ValidateLinks(std::string& str) } HyperlinkInfo info = ParseHyperlink(str.c_str() + pos); - if (!info) + if (!info) { // cannot be parsed at all, so we'll need to cut it out entirely // find the next start of a link std::string::size_type next = str.find("|c", pos + 1); |