adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make chan modes and permissions to be char instead of unsigned char.

Browse Source 
Deprecate old module hooks which accept mode as unsigned char.

SWIG handles unsigned char as int, but char as a string.
Before this commit, usage of HasPerm from perl modules required this:
either $chan->HasPerm(ord('@')) or $chan->HasPerm(ord($ZNC::CChan::Op)).
Now ord() is not necessary, and these calls work too:
$chan->HasPerm('@') and $chan->HasPerm($ZNC::CChan::Op).

Fix #1486
This commit is contained in:
Alexey Sokolov
2018-02-10 15:49:53 +00:00
parent 9ff4127e33
commit a2470b3dd3
10 changed files with 127 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Nick.cpp
+10 -10
View File
@@ -91,22 +91,22 @@ void CNick::SetNick(const CString& s) { m_sNick = s; }
void CNick::SetIdent(const CString& s) { m_sIdent = s; }
void CNick::SetHost(const CString& s) { m_sHost = s; }
bool CNick::HasPerm(unsigned char uPerm) const {
return (uPerm && m_sChanPerms.find(uPerm) != CString::npos);
bool CNick::HasPerm(char cPerm) const {
return (cPerm && m_sChanPerms.find(cPerm) != CString::npos);
}
bool CNick::AddPerm(unsigned char uPerm) {
if (!uPerm || HasPerm(uPerm)) {
bool CNick::AddPerm(char cPerm) {
if (!cPerm || HasPerm(cPerm)) {
return false;
}
m_sChanPerms.append(1, uPerm);
m_sChanPerms.append(1, cPerm);
return true;
}
bool CNick::RemPerm(unsigned char uPerm) {
CString::size_type uPos = m_sChanPerms.find(uPerm);
bool CNick::RemPerm(char cPerm) {
CString::size_type uPos = m_sChanPerms.find(cPerm);
if (uPos == CString::npos) {
return false;
}
@@ -116,12 +116,12 @@ bool CNick::RemPerm(unsigned char uPerm) {
return true;
}
unsigned char CNick::GetPermChar() const {
char CNick::GetPermChar() const {
CIRCSock* pIRCSock = (!m_pNetwork) ? nullptr : m_pNetwork->GetIRCSock();
const CString& sChanPerms = (!pIRCSock) ? "@+" : pIRCSock->GetPerms();
for (unsigned int a = 0; a < sChanPerms.size(); a++) {
const unsigned char& c = sChanPerms[a];
const char& c = sChanPerms[a];
if (HasPerm(c)) {
return c;
}
@@ -136,7 +136,7 @@ CString CNick::GetPermStr() const {
CString sRet;
for (unsigned int a = 0; a < sChanPerms.size(); a++) {
const unsigned char& c = sChanPerms[a];
const char& c = sChanPerms[a];
if (HasPerm(c)) {
sRet += c;