iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2015-08-04 23:47:42 +01:00
parent 9fe1027d8a b8330296a2
commit f7ccbed99a
2 changed files with 143 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
modules/modpython/cstring.i
View File

@@ -1,33 +1,35 @@
/*
SWIG-generated sources are used here.
This file is generated using:
echo '%include <std_string.i>' > foo.i
swig -python -py3 -c++ -shadow -E foo.i > string.i
Remove unrelated stuff from top of file which is included by default
s/std::string/CString/g
s/std_string/CString/g
*/
//
// String
//
%{
#include <string>
%}
%fragment("<string>");
%feature("naturalvar") CString;
class CString {
public:
typedef size_t size_type;
};
class CString;
/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,74,%typemaps_std_string@*/
/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,70,%typemaps_CString@*/
/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,4,%std_string_asptr@*/
/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,4,%CString_asptr@*/
%fragment("SWIG_" "AsPtr" "_" {CString},"header",fragment="SWIG_AsCharPtrAndSize") {
SWIGINTERN int
SWIG_AsPtr_std_string (PyObject * obj, CString **val)
SWIG_AsPtr_CString (PyObject * obj, CString **val)
{
char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) {
if (buf) {
if (val) *val = new CString(buf, size - 1);
if (alloc == SWIG_NEWOBJ) free((char*)buf);
if (alloc == SWIG_NEWOBJ) delete[] buf;
return SWIG_NEWOBJ;
} else {
if (val) *val = 0;
@@ -51,18 +53,18 @@ SWIG_AsPtr_std_string (PyObject * obj, CString **val)
}
}
/*@SWIG@*/
/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,52,%std_string_asval@*/
/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,48,%CString_asval@*/
%fragment("SWIG_" "AsVal" "_" {CString},"header", fragment="SWIG_" "AsPtr" "_" {CString}) {
SWIGINTERN int
SWIG_AsVal_std_string (PyObject * obj, CString *val)
SWIG_AsVal_CString (PyObject * obj, CString *val)
{
CString* v = (CString *) 0;
int res = SWIG_AsPtr_std_string (obj, &v);
int res = SWIG_AsPtr_CString (obj, &v);
if (!SWIG_IsOK(res)) return res;
if (v) {
if (val) *val = *v;
if (SWIG_IsNewObj(res)) {
free((char*)v);
delete v;
res = SWIG_DelNewMask(res);
}
return res;
@@ -71,45 +73,30 @@ SWIG_AsVal_std_string (PyObject * obj, CString *val)
}
}
/*@SWIG@*/
/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,38,%std_string_from@*/
%fragment("SWIG_" "From" "_" {CString},"header",fragment="SWIG_FromCharPtrAndSize",fragment="StdTraits") {
/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,38,%CString_from@*/
%fragment("SWIG_" "From" "_" {CString},"header",fragment="SWIG_FromCharPtrAndSize") {
SWIGINTERNINLINE PyObject *
SWIG_From_std_string (const CString& s)
SWIG_From_CString (const CString& s)
{
if (s.size()) {
return SWIG_FromCharPtrAndSize(s.data(), s.size());
} else {
return SWIG_FromCharPtrAndSize(s.c_str(), 0);
}
return SWIG_FromCharPtrAndSize(s.data(), s.size());
}
}
/*@SWIG@*/
%fragment("StdTraitsCString","header",fragment="SWIG_From_CString") {
namespace swig {
template<> struct traits_from<CString> {
static PyObject *from(const CString& s) {
return SWIG_From_std_string(s);
}
};
}
}
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,204,%typemaps_asptrfromn@*/
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,193,%typemaps_asptrfrom@*/
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,163,%typemaps_asptr@*/
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,201,%typemaps_asptrfromn@*/
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,190,%typemaps_asptrfrom@*/
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,160,%typemaps_asptr@*/
%fragment("SWIG_" "AsVal" "_" {CString},"header",fragment="SWIG_" "AsPtr" "_" {CString}) {
SWIGINTERNINLINE int
SWIG_AsVal_std_string (PyObject * obj, CString *val)
SWIG_AsVal_CString (PyObject * obj, CString *val)
{
CString *v = (CString *)0;
int res = SWIG_AsPtr_std_string (obj, &v);
int res = SWIG_AsPtr_CString (obj, &v);
if (!SWIG_IsOK(res)) return res;
if (v) {
if (val) *val = *v;
if (SWIG_IsNewObj(res)) {
free((char*)v);
delete v;
res = SWIG_DelNewMask(res);
}
return res;
@@ -117,67 +104,67 @@ SWIG_From_std_string (const CString& s)
return SWIG_ERROR;
}
}
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,31,%ptr_in_typemap@*/
%typemap(in,fragment="SWIG_" "AsPtr" "_" {CString},fragment="StdTraitsCString") CString {
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,28,%ptr_in_typemap@*/
%typemap(in,fragment="SWIG_" "AsPtr" "_" {CString}) CString {
CString *ptr = (CString *)0;
int res = SWIG_AsPtr_std_string($input, &ptr);
if (!SWIG_IsOK(res) || !ptr) {
SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'");
int res = SWIG_AsPtr_CString($input, &ptr);
if (!SWIG_IsOK(res) || !ptr) {
SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'");
}
$1 = *ptr;
if (SWIG_IsNewObj(res)) free((char*)ptr);
if (SWIG_IsNewObj(res)) delete ptr;
}
%typemap(freearg) CString "";
%typemap(in,fragment="SWIG_" "AsPtr" "_" {CString}) const CString & (int res = SWIG_OLDOBJ) {
CString *ptr = (CString *)0;
res = SWIG_AsPtr_std_string($input, &ptr);
res = SWIG_AsPtr_CString($input, &ptr);
if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); }
if (!ptr) { SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); }
$1 = ptr;
}
%typemap(freearg,noblock=1) const CString & {
if (SWIG_IsNewObj(res$argnum)) free((char*)$1);
if (SWIG_IsNewObj(res$argnum)) delete $1;
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,56,%ptr_varin_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,53,%ptr_varin_typemap@*/
%typemap(varin,fragment="SWIG_" "AsPtr" "_" {CString}) CString {
CString *ptr = (CString *)0;
int res = SWIG_AsPtr_std_string($input, &ptr);
if (!SWIG_IsOK(res) || !ptr) {
SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in variable '""$name""' of type '""$type""'");
int res = SWIG_AsPtr_CString($input, &ptr);
if (!SWIG_IsOK(res) || !ptr) {
SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in variable '""$name""' of type '""$type""'");
}
$1 = *ptr;
if (SWIG_IsNewObj(res)) free((char*)ptr);
if (SWIG_IsNewObj(res)) delete ptr;
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,71,%ptr_directorout_typemap@*/
%typemap(directorargout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *DIRECTOROUT ($*ltype temp) {
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,68,%ptr_directorout_typemap@*/
%typemap(directorargout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *DIRECTOROUT ($*ltype temp, int swig_ores) {
CString *swig_optr = 0;
int swig_ores = $input ? SWIG_AsPtr_std_string($input, &swig_optr) : 0;
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
swig_ores = $result ? SWIG_AsPtr_CString($result, &swig_optr) : 0;
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""$type""'");
}
temp = *swig_optr;
$result = &temp;
if (SWIG_IsNewObj(swig_ores)) free((char*)swig_optr);
$1 = &temp;
if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
}
%typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString {
CString *swig_optr = 0;
int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr);
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
int swig_ores = SWIG_AsPtr_CString($input, &swig_optr);
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""$type""'");
}
$result = *swig_optr;
if (SWIG_IsNewObj(swig_ores)) free((char*)swig_optr);
if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
}
%typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString},warning= "473:Returning a pointer or reference in a director method is not recommended." ) CString* {
CString *swig_optr = 0;
int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
int swig_ores = SWIG_AsPtr_CString($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_ores)), "in output value of type '""$type""'");
}
}
$result = swig_optr;
if (SWIG_IsNewObj(swig_ores)) {
swig_acquire_ownership(swig_optr);
@@ -192,14 +179,14 @@ SWIG_From_std_string (const CString& s)
%typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString},warning= "473:Returning a pointer or reference in a director method is not recommended." ) CString& {
CString *swig_optr = 0;
int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
int swig_ores = SWIG_AsPtr_CString($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_ores)), "in output value of type '""$type""'");
} else {
if (!swig_optr) {
if (!swig_optr) {
Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ValueError), "invalid null reference " "in output value of type '""$type""'");
}
}
}
}
$result = swig_optr;
if (SWIG_IsNewObj(swig_ores)) {
swig_acquire_ownership(swig_optr);
@@ -216,88 +203,88 @@ SWIG_From_std_string (const CString& s)
%typemap(directorout,fragment="SWIG_" "AsPtr" "_" {CString}) CString &DIRECTOROUT = CString
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,146,%ptr_typecheck_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,143,%ptr_typecheck_typemap@*/
%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString * {
int res = SWIG_AsPtr_std_string($input, (CString**)(0));
int res = SWIG_AsPtr_CString($input, (CString**)(0));
$1 = SWIG_CheckState(res);
}
%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString, const CString& {
int res = SWIG_AsPtr_std_string($input, (CString**)(0));
%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString, const CString& {
int res = SWIG_AsPtr_CString($input, (CString**)(0));
$1 = SWIG_CheckState(res);
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,254,%ptr_input_typemap@*/
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,117,%_ptr_input_typemap@*/
%typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT(int res = 0) {
res = SWIG_AsPtr_std_string($input, &$1);
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,254,%ptr_input_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,117,%_ptr_input_typemap@*/
%typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT(int res = 0) {
res = SWIG_AsPtr_CString($input, &$1);
if (!SWIG_IsOK(res)) {
SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'");
}
res = SWIG_AddTmpMask(res);
}
%typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString &INPUT(int res = 0) {
res = SWIG_AsPtr_std_string($input, &$1);
if (!SWIG_IsOK(res)) {
%typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString &INPUT(int res = 0) {
res = SWIG_AsPtr_CString($input, &$1);
if (!SWIG_IsOK(res)) {
SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'");
}
if (!$1) {
}
if (!$1) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'");
}
res = SWIG_AddTmpMask(res);
}
%typemap(freearg,noblock=1,match="in") CString *INPUT, CString &INPUT {
if (SWIG_IsNewObj(res$argnum)) free((char*)$1);
if (SWIG_IsNewObj(res$argnum)) delete $1;
}
%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT, CString &INPUT {
int res = SWIG_AsPtr_std_string($input, (CString**)0);
int res = SWIG_AsPtr_CString($input, (CString**)0);
$1 = SWIG_CheckState(res);
}
/*@SWIG@*/
/*@SWIG@*/;
/*@SWIG@*/
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,184,%typemaps_from@*/
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,55,%value_out_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,183,%typemaps_from@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,55,%value_out_typemap@*/
%typemap(out,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString {
$result = SWIG_From_std_string((CString)($1));
$result = SWIG_From_CString(static_cast< CString >($1));
}
%typemap(out,noblock=1,fragment="SWIG_" "From" "_" {CString}) const CString& {
$result = SWIG_From_std_string((CString)(*$1));
$result = SWIG_From_CString(static_cast< CString >(*$1));
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,79,%value_varout_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,79,%value_varout_typemap@*/
%typemap(varout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString& {
$result = SWIG_From_std_string((CString)($1));
$result = SWIG_From_CString(static_cast< CString >($1));
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,87,%value_constcode_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,87,%value_constcode_typemap@*/
%typemap(constcode,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString {
SWIG_Python_SetConstant(d, "$symname",SWIG_From_std_string((CString)($value)));
SWIG_Python_SetConstant(d, "$symname",SWIG_From_CString(static_cast< CString >($value)));
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,98,%value_directorin_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,98,%value_directorin_typemap@*/
%typemap(directorin,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *DIRECTORIN {
$input = SWIG_From_std_string((CString)(*$1_name));
$input = SWIG_From_CString(static_cast< CString >(*$1));
}
%typemap(directorin,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString& {
$input = SWIG_From_std_string((CString)($1_name));
$input = SWIG_From_CString(static_cast< CString >($1));
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,154,%value_throws_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,153,%value_throws_typemap@*/
%typemap(throws,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString {
SWIG_Python_Raise(SWIG_From_std_string((CString)($1)), "$type", 0); SWIG_fail;
SWIG_Python_Raise(SWIG_From_CString(static_cast< CString >($1)), "$type", 0); SWIG_fail;
}
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,258,%value_output_typemap@*/
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,175,%_value_output_typemap@*/
%typemap(in,numinputs=0,noblock=1)
CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ),
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,258,%value_output_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,175,%_value_output_typemap@*/
%typemap(in,numinputs=0,noblock=1)
CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ),
CString &OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ) {
$1 = &temp;
}
%typemap(argout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *OUTPUT, CString &OUTPUT {
if (SWIG_IsTmpObj(res$argnum)) {
$result = SWIG_Python_AppendOutput($result, SWIG_From_std_string((*$1)));
$result = SWIG_Python_AppendOutput($result, SWIG_From_CString((*$1)));
} else {
int new_flags = SWIG_IsNewObj(res$argnum) ? (SWIG_POINTER_OWN | 0 ) : 0 ;
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)($1), $1_descriptor, new_flags));
@@ -306,16 +293,16 @@ SWIG_From_std_string (const CString& s)
/*@SWIG@*/
/*@SWIG@*/;
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,258,%value_output_typemap@*/
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,175,%_value_output_typemap@*/
%typemap(in,numinputs=0,noblock=1)
CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ),
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,258,%value_output_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,175,%_value_output_typemap@*/
%typemap(in,numinputs=0,noblock=1)
CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ),
CString &OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ) {
$1 = &temp;
}
%typemap(argout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *OUTPUT, CString &OUTPUT {
if (SWIG_IsTmpObj(res$argnum)) {
$result = SWIG_Python_AppendOutput($result, SWIG_From_std_string((*$1)));
$result = SWIG_Python_AppendOutput($result, SWIG_From_CString((*$1)));
} else {
int new_flags = SWIG_IsNewObj(res$argnum) ? (SWIG_POINTER_OWN | 0 ) : 0 ;
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)($1), $1_descriptor, new_flags));
@@ -323,8 +310,8 @@ SWIG_From_std_string (const CString& s)
}
/*@SWIG@*/
/*@SWIG@*/;
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,240,%_ptr_inout_typemap@*/
/*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,230,%_value_inout_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,240,%_ptr_inout_typemap@*/
/*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,230,%_value_inout_typemap@*/
%typemap(in) CString *INOUT = CString *INPUT;
%typemap(in) CString &INOUT = CString &INPUT;
%typemap(typecheck) CString *INOUT = CString *INPUT;
@@ -337,9 +324,5 @@ SWIG_From_std_string (const CString& s)
%typemap(freearg) CString *INOUT = CString *INPUT;
%typemap(freearg) CString &INOUT = CString &INPUT;
/*@SWIG@*/;
/*@SWIG@*/;
/*@SWIG@*/;
/*@SWIG@*/;
/*@SWIG@*/