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

Fix #1543 for modperl too

Browse Source 
While at it, fix a memory leak in NV handling

Add some tests
This commit is contained in:
Alexey Sokolov
2018-06-04 22:03:10 +01:00
parent 8eebdf750d
commit 4b92790562
2 changed files with 109 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modperl/modperl.i
+25 -30
View File
@@ -73,21 +73,24 @@ namespace std {
};
}
%include "modperl/CString.i"
%template(_stringlist) std::list<CString>;
%typemap(out) std::list<CString> {
std::list<CString>::const_iterator i;
unsigned int j;
int len = $1.size();
SV **svs = new SV*[len];
for (i=$1.begin(), j=0; i!=$1.end(); i++, j++) {
svs[j] = sv_newmortal();
SwigSvFromString(svs[j], *i);
}
AV *myav = av_make(len, svs);
delete[] svs;
$result = newRV_noinc((SV*) myav);
sv_2mortal($result);
argvi++;
%typemap(out) VCString {
EXTEND(sp, $1.size());
for (int i = 0; i < $1.size(); ++i) {
SV* x = newSV(0);
SwigSvFromString(x, $1[i]);
$result = sv_2mortal(x);
argvi++;
}
}
%typemap(out) const VCString& {
EXTEND(sp, $1->size());
for (int i = 0; i < $1->size(); ++i) {
SV* x = newSV(0);
SwigSvFromString(x, (*$1)[i]);
$result = sv_2mortal(x);
argvi++;
}
}
%template(VIRCNetworks) std::vector<CIRCNetwork*>;
@@ -176,26 +179,18 @@ class MCString : public std::map<CString, CString> {};
%}
%extend CModule {
std::list<CString> _GetNVKeys() {
std::list<CString> res;
for (MCString::iterator i = $self->BeginNV(); i != $self->EndNV(); ++i) {
res.push_back(i->first);
}
return res;
}
VCString GetNVKeys() {
VCString result;
for (auto i = $self->BeginNV(); i != $self->EndNV(); ++i) {
result.push_back(i->first);
}
return result;
}
bool ExistsNV(const CString& sName) {
return $self->EndNV() != $self->FindNV(sName);
}
}
%perlcode %{
package ZNC::CModule;
sub GetNVKeys {
my $result = _GetNVKeys(@_);
return @$result;
}
%}
%extend CModules {
void push_back(CModule* p) {
$self->push_back(p);