From: JINMEI Tatuya Date: Sat, 26 Jan 2013 04:25:16 +0000 (-0800) Subject: [1866] remove old proxy-func style RRType/Class constants X-Git-Tag: bind10-1.0.0-rc-release~27^2~8^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f74193c572fefc2e718ca0952962494a9680ddb;p=thirdparty%2Fkea.git [1866] remove old proxy-func style RRType/Class constants --- diff --git a/src/lib/dns/python/rrclass_python.cc b/src/lib/dns/python/rrclass_python.cc index a566f4744d..d62c88dfe6 100644 --- a/src/lib/dns/python/rrclass_python.cc +++ b/src/lib/dns/python/rrclass_python.cc @@ -54,13 +54,6 @@ PyObject* RRClass_getCode(s_RRClass* self); PyObject* RRClass_richcmp(s_RRClass* self, s_RRClass* other, int op); Py_hash_t RRClass_hash(PyObject* pyself); -// Static function for direct class creation -PyObject* RRClass_IN(s_RRClass *self); -PyObject* RRClass_CH(s_RRClass *self); -PyObject* RRClass_HS(s_RRClass *self); -PyObject* RRClass_NONE(s_RRClass *self); -PyObject* RRClass_ANY(s_RRClass *self); - typedef CPPPyObjectContainer RRClassContainer; // This list contains the actual set of functions we have in @@ -81,11 +74,6 @@ PyMethodDef RRClass_methods[] = { "returned" }, { "get_code", reinterpret_cast(RRClass_getCode), METH_NOARGS, "Returns the class code as an integer" }, - { "IN", reinterpret_cast(RRClass_IN), METH_NOARGS | METH_STATIC, "Creates an IN RRClass" }, - { "CH", reinterpret_cast(RRClass_CH), METH_NOARGS | METH_STATIC, "Creates a CH RRClass" }, - { "HS", reinterpret_cast(RRClass_HS), METH_NOARGS | METH_STATIC, "Creates an HS RRClass" }, - { "NONE", reinterpret_cast(RRClass_NONE), METH_NOARGS | METH_STATIC, "Creates a NONE RRClass" }, - { "ANY", reinterpret_cast(RRClass_ANY), METH_NOARGS | METH_STATIC, "Creates an ANY RRClass" }, { NULL, NULL, 0, NULL } }; @@ -234,37 +222,6 @@ RRClass_richcmp(s_RRClass* self, s_RRClass* other, int op) { Py_RETURN_FALSE; } -// -// Common function for RRClass_IN/CH/etc. -// -PyObject* RRClass_createStatic(RRClass stc) { - s_RRClass* ret = PyObject_New(s_RRClass, &rrclass_type); - if (ret != NULL) { - ret->cppobj = new RRClass(stc); - } - return (ret); -} - -PyObject* RRClass_IN(s_RRClass*) { - return (RRClass_createStatic(RRClass::IN())); -} - -PyObject* RRClass_CH(s_RRClass*) { - return (RRClass_createStatic(RRClass::CH())); -} - -PyObject* RRClass_HS(s_RRClass*) { - return (RRClass_createStatic(RRClass::HS())); -} - -PyObject* RRClass_NONE(s_RRClass*) { - return (RRClass_createStatic(RRClass::NONE())); -} - -PyObject* RRClass_ANY(s_RRClass*) { - return (RRClass_createStatic(RRClass::ANY())); -} - Py_hash_t RRClass_hash(PyObject* pyself) { const s_RRClass* const self = static_cast(pyself); diff --git a/src/lib/dns/python/rrtype_python.cc b/src/lib/dns/python/rrtype_python.cc index 97b66d4282..bf705ccb5d 100644 --- a/src/lib/dns/python/rrtype_python.cc +++ b/src/lib/dns/python/rrtype_python.cc @@ -50,25 +50,6 @@ PyObject* RRType_toWire(s_RRType* self, PyObject* args); PyObject* RRType_getCode(s_RRType* self); PyObject* RRType_richcmp(s_RRType* self, s_RRType* other, int op); Py_hash_t RRType_hash(PyObject* pyself); -PyObject* RRType_NSEC3PARAM(s_RRType *self); -PyObject* RRType_DNAME(s_RRType *self); -PyObject* RRType_PTR(s_RRType *self); -PyObject* RRType_MX(s_RRType *self); -PyObject* RRType_DNSKEY(s_RRType *self); -PyObject* RRType_TXT(s_RRType *self); -PyObject* RRType_RRSIG(s_RRType *self); -PyObject* RRType_NSEC(s_RRType *self); -PyObject* RRType_AAAA(s_RRType *self); -PyObject* RRType_DS(s_RRType *self); -PyObject* RRType_OPT(s_RRType *self); -PyObject* RRType_A(s_RRType *self); -PyObject* RRType_NS(s_RRType *self); -PyObject* RRType_CNAME(s_RRType *self); -PyObject* RRType_SOA(s_RRType *self); -PyObject* RRType_NSEC3(s_RRType *self); -PyObject* RRType_IXFR(s_RRType *self); -PyObject* RRType_AXFR(s_RRType *self); -PyObject* RRType_ANY(s_RRType *self); typedef CPPPyObjectContainer RRTypeContainer; @@ -90,25 +71,6 @@ PyMethodDef RRType_methods[] = { "returned" }, { "get_code", reinterpret_cast(RRType_getCode), METH_NOARGS, "Returns the type code as an integer" }, - { "NSEC3PARAM", reinterpret_cast(RRType_NSEC3PARAM), METH_NOARGS | METH_STATIC, "Creates an NSEC3PARAM RRType" }, - { "DNAME", reinterpret_cast(RRType_DNAME), METH_NOARGS | METH_STATIC, "Creates a DNAME RRType" }, - { "PTR", reinterpret_cast(RRType_PTR), METH_NOARGS | METH_STATIC, "Creates a PTR RRType" }, - { "MX", reinterpret_cast(RRType_MX), METH_NOARGS | METH_STATIC, "Creates an MX RRType" }, - { "DNSKEY", reinterpret_cast(RRType_DNSKEY), METH_NOARGS | METH_STATIC, "Creates a DNSKEY RRType" }, - { "TXT", reinterpret_cast(RRType_TXT), METH_NOARGS | METH_STATIC, "Creates a TXT RRType" }, - { "RRSIG", reinterpret_cast(RRType_RRSIG), METH_NOARGS | METH_STATIC, "Creates a RRSIG RRType" }, - { "NSEC", reinterpret_cast(RRType_NSEC), METH_NOARGS | METH_STATIC, "Creates a NSEC RRType" }, - { "AAAA", reinterpret_cast(RRType_AAAA), METH_NOARGS | METH_STATIC, "Creates an AAAA RRType" }, - { "DS", reinterpret_cast(RRType_DS), METH_NOARGS | METH_STATIC, "Creates a DS RRType" }, - { "OPT", reinterpret_cast(RRType_OPT), METH_NOARGS | METH_STATIC, "Creates an OPT RRType" }, - { "A", reinterpret_cast(RRType_A), METH_NOARGS | METH_STATIC, "Creates an A RRType" }, - { "NS", reinterpret_cast(RRType_NS), METH_NOARGS | METH_STATIC, "Creates an NS RRType" }, - { "CNAME", reinterpret_cast(RRType_CNAME), METH_NOARGS | METH_STATIC, "Creates a CNAME RRType" }, - { "SOA", reinterpret_cast(RRType_SOA), METH_NOARGS | METH_STATIC, "Creates a SOA RRType" }, - { "NSEC3", reinterpret_cast(RRType_NSEC3), METH_NOARGS | METH_STATIC, "Creates an NSEC3 RRType" }, - { "IXFR", reinterpret_cast(RRType_IXFR), METH_NOARGS | METH_STATIC, "Creates an IXFR RRType" }, - { "AXFR", reinterpret_cast(RRType_AXFR), METH_NOARGS | METH_STATIC, "Creates an AXFR RRType" }, - { "ANY", reinterpret_cast(RRType_ANY), METH_NOARGS | METH_STATIC, "Creates an ANY RRType" }, { NULL, NULL, 0, NULL } }; @@ -263,112 +225,6 @@ RRType_richcmp(s_RRType* self, s_RRType* other, int op) { Py_RETURN_FALSE; } -// -// Common function for RRType_A/NS/etc. -// -PyObject* RRType_createStatic(RRType stc) { - s_RRType* ret = PyObject_New(s_RRType, &rrtype_type); - if (ret != NULL) { - ret->cppobj = new RRType(stc); - } - return (ret); -} - -PyObject* -RRType_NSEC3PARAM(s_RRType*) { - return (RRType_createStatic(RRType::NSEC3PARAM())); -} - -PyObject* -RRType_DNAME(s_RRType*) { - return (RRType_createStatic(RRType::DNAME())); -} - -PyObject* -RRType_PTR(s_RRType*) { - return (RRType_createStatic(RRType::PTR())); -} - -PyObject* -RRType_MX(s_RRType*) { - return (RRType_createStatic(RRType::MX())); -} - -PyObject* -RRType_DNSKEY(s_RRType*) { - return (RRType_createStatic(RRType::DNSKEY())); -} - -PyObject* -RRType_TXT(s_RRType*) { - return (RRType_createStatic(RRType::TXT())); -} - -PyObject* -RRType_RRSIG(s_RRType*) { - return (RRType_createStatic(RRType::RRSIG())); -} - -PyObject* -RRType_NSEC(s_RRType*) { - return (RRType_createStatic(RRType::NSEC())); -} - -PyObject* -RRType_AAAA(s_RRType*) { - return (RRType_createStatic(RRType::AAAA())); -} - -PyObject* -RRType_DS(s_RRType*) { - return (RRType_createStatic(RRType::DS())); -} - -PyObject* -RRType_OPT(s_RRType*) { - return (RRType_createStatic(RRType::OPT())); -} - -PyObject* -RRType_A(s_RRType*) { - return (RRType_createStatic(RRType::A())); -} - -PyObject* -RRType_NS(s_RRType*) { - return (RRType_createStatic(RRType::NS())); -} - -PyObject* -RRType_CNAME(s_RRType*) { - return (RRType_createStatic(RRType::CNAME())); -} - -PyObject* -RRType_SOA(s_RRType*) { - return (RRType_createStatic(RRType::SOA())); -} - -PyObject* -RRType_NSEC3(s_RRType*) { - return (RRType_createStatic(RRType::NSEC3())); -} - -PyObject* -RRType_IXFR(s_RRType*) { - return (RRType_createStatic(RRType::IXFR())); -} - -PyObject* -RRType_AXFR(s_RRType*) { - return (RRType_createStatic(RRType::AXFR())); -} - -PyObject* -RRType_ANY(s_RRType*) { - return (RRType_createStatic(RRType::ANY())); -} - Py_hash_t RRType_hash(PyObject* pyself) { const s_RRType* const self = static_cast(pyself);