[svn] commit: r2887 - in /branches/trac232/src/lib/datasrc: data_source.cc data_source.h python/libdata_source_python.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Sep 9 08:25:29 UTC 2010
Author: jelte
Date: Thu Sep 9 08:25:29 2010
New Revision: 2887
Log:
assorted cleanups
Modified:
branches/trac232/src/lib/datasrc/data_source.cc
branches/trac232/src/lib/datasrc/data_source.h
branches/trac232/src/lib/datasrc/python/libdata_source_python.cc
Modified: branches/trac232/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.cc (original)
+++ branches/trac232/src/lib/datasrc/data_source.cc Thu Sep 9 08:25:29 2010
@@ -1339,7 +1339,8 @@
}
isc::dns::Rcode
-DataSrc::updateCheckPrerequisite(DataSrcTransaction& transaction, RRsetPtr prereq)
+DataSrc::updateCheckPrerequisite(DataSrcTransaction& transaction,
+ ConstRRsetPtr prereq)
{
// section 3.2 of RFC2136
if (prereq->getClass() == RRClass::ANY()) {
Modified: branches/trac232/src/lib/datasrc/data_source.h
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.h (original)
+++ branches/trac232/src/lib/datasrc/data_source.h Thu Sep 9 08:25:29 2010
@@ -441,7 +441,7 @@
/// \param prereq the prerequisite RRset
/// \return The DNS Rcode as defined by the rules in RFC2136
virtual isc::dns::Rcode updateCheckPrerequisite(DataSrcTransaction& transaction,
- isc::dns::RRsetPtr prereq);
+ isc::dns::ConstRRsetPtr prereq);
/// \brief Handles a single update as described in section 3.4 of
/// RFC2136
Modified: branches/trac232/src/lib/datasrc/python/libdata_source_python.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/python/libdata_source_python.cc (original)
+++ branches/trac232/src/lib/datasrc/python/libdata_source_python.cc Thu Sep 9 08:25:29 2010
@@ -268,7 +268,7 @@
} else if (PyArg_ParseTuple(args, "O!", class_type, &rrclass_obj)) {
// convert the class object to string, then create an RRClass
// with that string (is there a more direct way to do this?)
- PyObject* rrclass_obj_str = PyObject_CallMethod(rrclass_obj, "to_text", NULL);
+ PyObject* rrclass_obj_str = PyObject_CallMethod(rrclass_obj, const_cast<char*>("to_text"), NULL);
const char* rrclass_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(rrclass_obj_str));
isc::dns::RRClass rrclass = isc::dns::RRClass(rrclass_str);
std::cout << "[XX] converted to string" << std::endl;
@@ -293,117 +293,115 @@
* (TODO: move to separate file)
*/
isc::dns::Name
-pyName_AsName(PyObject* name_obj)
-{
- PyObject* name_obj_str = PyObject_CallMethod(name_obj, "to_text", NULL);
+PyName_AsName(PyObject* name_obj)
+{
+ PyObject* name_obj_str = PyObject_CallMethod(name_obj,
+ const_cast<char*>("to_text"),
+ NULL);
const char* name_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(name_obj_str));
Py_DECREF(name_obj_str);
- return isc::dns::Name(name_str);
-}
-
-// do we need this one?
-/*
-const char *
-pyName_AsString(PyObject* name_obj)
-{
- PyObject* name_obj_str = PyObject_CallMethod(name_obj, "to_text", NULL);
- return PyBytes_AS_STRING(PyUnicode_AsUTF8String(name_obj_str));
-}
-*/
+ return (isc::dns::Name(name_str));
+}
PyObject*
-pyName_FromString(const char* name_str)
+PyName_FromString(const char* name_str)
{
PyObject* name_class = PyObject_GetAttrString(po_DNS_module, "Name");
PyObject* name = PyObject_CallObject(name_class, Py_BuildValue("(s)", name_str));
Py_DECREF(name_class);
- return name;
+ return (name);
}
PyObject*
-pyName_FromName(const isc::dns::Name& name)
-{
- return pyName_FromString(name.toText().c_str());
+PyName_FromName(const isc::dns::Name& name)
+{
+ return (PyName_FromString(name.toText().c_str()));
}
isc::dns::RRClass
-pyRRClass_AsRRClass(PyObject* rrclass_obj)
-{
- PyObject* rrclass_obj_str = PyObject_CallMethod(rrclass_obj, "to_text", NULL);
+PyRRClass_AsRRClass(PyObject* rrclass_obj)
+{
+ PyObject* rrclass_obj_str = PyObject_CallMethod(rrclass_obj,
+ const_cast<char*>("to_text"),
+ NULL);
const char* rrclass_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(rrclass_obj_str));
Py_DECREF(rrclass_obj_str);
- return isc::dns::RRClass(rrclass_str);
+ return (isc::dns::RRClass(rrclass_str));
}
PyObject*
-pyRRClass_FromString(const char* rrclass_str)
+PyRRClass_FromString(const char* rrclass_str)
{
PyObject* rrclass_class = PyObject_GetAttrString(po_DNS_module, "RRClass");
PyObject* rrclass = PyObject_CallObject(rrclass_class, Py_BuildValue("(s)", rrclass_str));
Py_DECREF(rrclass_class);
- return rrclass;
+ return (rrclass);
}
PyObject*
-pyRRClass_FromRRClass(const isc::dns::RRClass& rrclass)
-{
- return pyRRClass_FromString(rrclass.toText().c_str());
+PyRRClass_FromRRClass(const isc::dns::RRClass& rrclass)
+{
+ return (PyRRClass_FromString(rrclass.toText().c_str()));
}
PyObject*
-pyRRType_FromString(const char* rrtype_str)
+PyRRType_FromString(const char* rrtype_str)
{
PyObject* rrtype_class = PyObject_GetAttrString(po_DNS_module, "RRType");
PyObject* rrtype = PyObject_CallObject(rrtype_class, Py_BuildValue("(s)", rrtype_str));
Py_DECREF(rrtype_class);
- return rrtype;
+ return (rrtype);
}
PyObject*
-pyRRType_FromRRType(const isc::dns::RRType& rrtype)
-{
- return pyRRType_FromString(rrtype.toText().c_str());
+PyRRType_FromRRType(const isc::dns::RRType& rrtype)
+{
+ return (PyRRType_FromString(rrtype.toText().c_str()));
}
isc::dns::RRType
-pyRRType_AsRRType(PyObject* rrtype_obj)
-{
- PyObject* rrtype_obj_str = PyObject_CallMethod(rrtype_obj, "to_text", NULL);
+PyRRType_AsRRType(PyObject* rrtype_obj)
+{
+ PyObject* rrtype_obj_str = PyObject_CallMethod(rrtype_obj,
+ const_cast<char*>("to_text"),
+ NULL);
const char* rrtype_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(rrtype_obj_str));
Py_DECREF(rrtype_obj_str);
- return isc::dns::RRType(rrtype_str);
+ return (isc::dns::RRType(rrtype_str));
}
PyObject*
-pyRRTTL_FromString(const char* rrttl_str)
+PyRRTTL_FromString(const char* rrttl_str)
{
PyObject* rrttl_class = PyObject_GetAttrString(po_DNS_module, "RRTTL");
PyObject* rrttl = PyObject_CallObject(rrttl_class, Py_BuildValue("(s)", rrttl_str));
Py_DECREF(rrttl_class);
- return rrttl;
+ return (rrttl);
}
PyObject*
-pyRRTTL_FromRRTTL(const isc::dns::RRTTL& rrttl)
-{
- return pyRRTTL_FromString(rrttl.toText().c_str());
+PyRRTTL_FromRRTTL(const isc::dns::RRTTL& rrttl)
+{
+ return (PyRRTTL_FromString(rrttl.toText().c_str()));
}
isc::dns::RRTTL
-pyRRTTL_AsRRTTL(PyObject* rrttl_obj)
-{
- PyObject* rrttl_obj_str = PyObject_CallMethod(rrttl_obj, "to_text", NULL);
+PyRRTTL_AsRRTTL(PyObject* rrttl_obj)
+{
+ PyObject* rrttl_obj_str = PyObject_CallMethod(rrttl_obj,
+ const_cast<char*>("to_text"),
+ NULL);
const char* rrttl_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(rrttl_obj_str));
Py_DECREF(rrttl_obj_str);
- return isc::dns::RRTTL(rrttl_str);
+ return (isc::dns::RRTTL(rrttl_str));
}
// for Rdata we have no getClass and getType, so we need to provide these
PyObject*
-pyRdata_createRdata(const isc::dns::RRType& rrtype, const isc::dns::RRClass& rrclass, const isc::dns::rdata::Rdata& rdata) {
+PyRRTTL_CreateRdata(const isc::dns::RRType& rrtype, const isc::dns::RRClass& rrclass, const isc::dns::rdata::Rdata& rdata) {
PyObject* rdata_class = PyObject_GetAttrString(po_DNS_module, "Rdata");
- PyObject* type_obj = pyRRType_FromRRType(rrtype);
- PyObject* class_obj = pyRRClass_FromRRClass(rrclass);
+ PyObject* type_obj = PyRRType_FromRRType(rrtype);
+ PyObject* class_obj = PyRRClass_FromRRClass(rrclass);
PyObject* rdata_obj = PyObject_CallObject(rdata_class,
Py_BuildValue("(OOs)",
type_obj,
@@ -412,36 +410,38 @@
Py_DECREF(rdata_class);
Py_DECREF(type_obj);
Py_DECREF(class_obj);
- return rdata_obj;
+ return (rdata_obj);
}
// for Rdata we have no getClass and getType, so we need to provide these
isc::dns::rdata::ConstRdataPtr
PyRdata_AsRdataPtr(const isc::dns::RRType& rrtype, const isc::dns::RRClass& rrclass, PyObject* rdata_obj)
{
- PyObject* rdata_obj_str = PyObject_CallMethod(rdata_obj, "to_text", NULL);
+ PyObject* rdata_obj_str = PyObject_CallMethod(rdata_obj,
+ const_cast<char*>("to_text"),
+ NULL);
const char* rdata_str = PyBytes_AS_STRING(PyUnicode_AsUTF8String(rdata_obj_str));
Py_DECREF(rdata_obj_str);
- return isc::dns::rdata::createRdata(rrtype, rrclass, rdata_str);
+ return (isc::dns::rdata::createRdata(rrtype, rrclass, rdata_str));
}
int
-pyRRset_Check(PyObject* rrset_obj)
+PyRRset_Check(PyObject* rrset_obj)
{
PyObject* rrset_class = PyObject_GetAttrString(po_DNS_module, "RRset");
int result = PyObject_IsInstance(rrset_obj, rrset_class);
Py_DECREF(rrset_class);
- return result;
+ return (result);
}
PyObject*
-pyRRset_FromRRset(const isc::dns::RRset& rrset)
+PyRRset_FromRRset(const isc::dns::RRset& rrset)
{
PyObject* rrset_class = PyObject_GetAttrString(po_DNS_module, "RRset");
- PyObject* name_obj = pyName_FromName(rrset.getName());
- PyObject* rrclass_obj = pyRRClass_FromRRClass(rrset.getClass());
- PyObject* rrtype_obj = pyRRType_FromRRType(rrset.getType());
- PyObject* rrttl_obj = pyRRTTL_FromRRTTL(rrset.getTTL());
+ PyObject* name_obj = PyName_FromName(rrset.getName());
+ PyObject* rrclass_obj = PyRRClass_FromRRClass(rrset.getClass());
+ PyObject* rrtype_obj = PyRRType_FromRRType(rrset.getType());
+ PyObject* rrttl_obj = PyRRTTL_FromRRTTL(rrset.getTTL());
PyObject* rrset_obj = PyObject_CallObject(rrset_class,
Py_BuildValue("OOOO",
@@ -458,28 +458,39 @@
isc::dns::RdataIteratorPtr it = rrset.getRdataIterator();
for (it->first(); !it->isLast(); it->next()) {
- PyObject* rdata_obj = pyRdata_createRdata(rrset.getType(), rrset.getClass(), it->getCurrent());
- PyObject_CallMethod(rrset_obj, "add_rdata", "O", rdata_obj);
+ PyObject* rdata_obj = PyRRTTL_CreateRdata(rrset.getType(), rrset.getClass(), it->getCurrent());
+ PyObject_CallMethod(rrset_obj, const_cast<char*>("add_rdata"),
+ const_cast<char*>("O"), rdata_obj);
Py_DECREF(rdata_obj);
}
- return rrset_obj;
+ return (rrset_obj);
}
isc::dns::RRsetPtr
-pyRRset_AsRRsetPtr(PyObject* rrset_obj)
-{
- PyObject* name_obj = PyObject_CallMethod(rrset_obj, "get_name", NULL);
- isc::dns::Name name = pyName_AsName(name_obj);
- PyObject* rrclass_obj = PyObject_CallMethod(rrset_obj, "get_class", NULL);
- isc::dns::RRClass rrclass = pyRRClass_AsRRClass(rrclass_obj);
- PyObject* rrtype_obj = PyObject_CallMethod(rrset_obj, "get_type", NULL);
- isc::dns::RRType rrtype = pyRRType_AsRRType(rrtype_obj);
- PyObject* rrttl_obj = PyObject_CallMethod(rrset_obj, "get_ttl", NULL);
- isc::dns::RRTTL rrttl = pyRRTTL_AsRRTTL(rrttl_obj);
+PyRRset_AsRRsetPtr(PyObject* rrset_obj)
+{
+ PyObject* name_obj = PyObject_CallMethod(rrset_obj,
+ const_cast<char*>("get_name"),
+ NULL);
+ isc::dns::Name name = PyName_AsName(name_obj);
+ PyObject* rrclass_obj = PyObject_CallMethod(rrset_obj,
+ const_cast<char*>("get_class"),
+ NULL);
+ isc::dns::RRClass rrclass = PyRRClass_AsRRClass(rrclass_obj);
+ PyObject* rrtype_obj = PyObject_CallMethod(rrset_obj,
+ const_cast<char*>("get_type"),
+ NULL);
+ isc::dns::RRType rrtype = PyRRType_AsRRType(rrtype_obj);
+ PyObject* rrttl_obj = PyObject_CallMethod(rrset_obj,
+ const_cast<char*>("get_ttl"),
+ NULL);
+ isc::dns::RRTTL rrttl = PyRRTTL_AsRRTTL(rrttl_obj);
isc::dns::RRsetPtr rrset_ptr = isc::dns::RRsetPtr(new
isc::dns::RRset(name, rrclass, rrtype, rrttl));
- PyObject* rdata_list_obj = PyObject_CallMethod(rrset_obj, "get_rdata", NULL);
+ PyObject* rdata_list_obj = PyObject_CallMethod(rrset_obj,
+ const_cast<char*>("get_rdata"),
+ NULL);
for (int i = 0; i < PyList_Size(rdata_list_obj); ++i) {
isc::dns::rdata::ConstRdataPtr rdata = PyRdata_AsRdataPtr(rrtype, rrclass, PyList_GET_ITEM(rdata_list_obj, i));
rrset_ptr->addRdata(*rdata);
@@ -489,16 +500,16 @@
Py_DECREF(rrtype_obj);
Py_DECREF(rrttl_obj);
- return rrset_ptr;
+ return (rrset_ptr);
}
PyObject*
-pyRcode_FromRcode(const isc::dns::Rcode& rcode)
+PyRcode_FromRcode(const isc::dns::Rcode& rcode)
{
PyObject* rcode_class = PyObject_GetAttrString(po_DNS_module, "Rcode");
PyObject* rcode_obj = PyObject_CallObject(rcode_class, Py_BuildValue("(I)", rcode.getCode()));
Py_DECREF(rcode_class);
- return rcode_obj;
+ return (rcode_obj);
}
/* end of conversion functions */
@@ -565,10 +576,10 @@
"argument 4 of find_rrset is not a List");
return (NULL);
}
- isc::dns::Name n = pyName_AsName(name_obj);
- isc::dns::RRClass c = pyRRClass_AsRRClass(class_obj);
- isc::dns::RRType t = pyRRType_AsRRType(type_obj);
- isc::dns::Name zone_name = pyName_AsName(zone_name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
+ isc::dns::RRClass c = PyRRClass_AsRRClass(class_obj);
+ isc::dns::RRType t = PyRRType_AsRRType(type_obj);
+ isc::dns::Name zone_name = PyName_AsName(zone_name_obj);
isc::dns::RRsetList result_list;
isc::datasrc::DataSrc::Result result =
@@ -577,12 +588,12 @@
if (result == isc::datasrc::DataSrc::SUCCESS) {
BOOST_FOREACH(isc::dns::RRsetPtr rrs, result_list) {
- PyObject *rrset_obj = pyRRset_FromRRset(*rrs);
+ PyObject *rrset_obj = PyRRset_FromRRset(*rrs);
PyList_Append(result_list_obj, rrset_obj);
Py_DECREF(rrset_obj);
}
}
- return Py_BuildValue("I", result);
+ return (Py_BuildValue("I", result));
} else {
return (NULL);
}
@@ -612,10 +623,10 @@
"argument 4 of find_rrset is not a List");
return (NULL);
}
- isc::dns::Name n = pyName_AsName(name_obj);
- isc::dns::RRClass c = pyRRClass_AsRRClass(class_obj);
- isc::dns::RRType t = pyRRType_AsRRType(type_obj);
- isc::dns::Name zone_name = pyName_AsName(zone_name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
+ isc::dns::RRClass c = PyRRClass_AsRRClass(class_obj);
+ isc::dns::RRType t = PyRRType_AsRRType(type_obj);
+ isc::dns::Name zone_name = PyName_AsName(zone_name_obj);
isc::dns::RRsetList result_list;
isc::datasrc::DataSrc::Result result =
@@ -623,11 +634,11 @@
flags, &zone_name);
BOOST_FOREACH(isc::dns::RRsetPtr rrs, result_list) {
- PyObject *rrset_obj = pyRRset_FromRRset(*rrs);
+ PyObject *rrset_obj = PyRRset_FromRRset(*rrs);
PyList_Append(result_list_obj, rrset_obj);
Py_DECREF(rrset_obj);
}
- return Py_BuildValue("I", result);
+ return (Py_BuildValue("I", result));
} else {
return (NULL);
}
@@ -654,9 +665,9 @@
"argument 4 of find_rrset is not a List");
return (NULL);
}
- isc::dns::Name n = pyName_AsName(name_obj);
- isc::dns::RRClass c = pyRRClass_AsRRClass(class_obj);
- isc::dns::Name zone_name = pyName_AsName(zone_name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
+ isc::dns::RRClass c = PyRRClass_AsRRClass(class_obj);
+ isc::dns::Name zone_name = PyName_AsName(zone_name_obj);
isc::dns::RRsetList result_list;
isc::datasrc::DataSrc::Result result =
@@ -664,11 +675,11 @@
flags, &zone_name);
BOOST_FOREACH(isc::dns::RRsetPtr rrs, result_list) {
- PyObject *rrset_obj = pyRRset_FromRRset(*rrs);
+ PyObject *rrset_obj = PyRRset_FromRRset(*rrs);
PyList_Append(result_list_obj, rrset_obj);
Py_DECREF(rrset_obj);
}
- return Py_BuildValue("I", result);
+ return (Py_BuildValue("I", result));
} else {
return (NULL);
}
@@ -695,9 +706,9 @@
"argument 4 of find_rrset is not a List");
return (NULL);
}
- isc::dns::Name n = pyName_AsName(name_obj);
- isc::dns::RRClass c = pyRRClass_AsRRClass(class_obj);
- isc::dns::Name zone_name = pyName_AsName(zone_name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
+ isc::dns::RRClass c = PyRRClass_AsRRClass(class_obj);
+ isc::dns::Name zone_name = PyName_AsName(zone_name_obj);
isc::dns::RRsetList result_list;
isc::datasrc::DataSrc::Result result =
@@ -705,11 +716,11 @@
flags, &zone_name);
BOOST_FOREACH(isc::dns::RRsetPtr rrs, result_list) {
- PyObject *rrset_obj = pyRRset_FromRRset(*rrs);
+ PyObject *rrset_obj = PyRRset_FromRRset(*rrs);
PyList_Append(result_list_obj, rrset_obj);
Py_DECREF(rrset_obj);
}
- return Py_BuildValue("I", result);
+ return (Py_BuildValue("I", result));
} else {
return (NULL);
}
@@ -726,17 +737,17 @@
Py_DECREF(name_class);
if (args_check) {
- isc::dns::Name n = pyName_AsName(name_obj);
- isc::dns::Name zone_name = pyName_AsName(zone_name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
+ isc::dns::Name zone_name = PyName_AsName(zone_name_obj);
isc::dns::Name result_name("old.");
isc::datasrc::DataSrc::Result result =
self->datasrc->findPreviousName(n, result_name, &zone_name);
if (result == isc::datasrc::DataSrc::SUCCESS) {
- return Py_BuildValue("(IO)", result, pyName_FromName(result_name));
+ return (Py_BuildValue("(IO)", result, PyName_FromName(result_name)));
} else {
Py_INCREF(Py_None);
- return Py_BuildValue("(IO)", result, Py_None);
+ return (Py_BuildValue("(IO)", result, Py_None));
}
} else {
return (NULL);
@@ -761,7 +772,7 @@
"argument 3 of find_covering_nsec3 is not a List");
return (NULL);
}
- isc::dns::Name n = pyName_AsName(name_obj);
+ isc::dns::Name n = PyName_AsName(name_obj);
std::string hash_str(hash);
isc::dns::RRsetList result_list;
isc::datasrc::DataSrc::Result result =
@@ -769,12 +780,12 @@
if (result == isc::datasrc::DataSrc::SUCCESS) {
BOOST_FOREACH(isc::dns::RRsetPtr rrs, result_list) {
- PyObject *rrset_obj = pyRRset_FromRRset(*rrs);
+ PyObject *rrset_obj = PyRRset_FromRRset(*rrs);
PyList_Append(result_list_obj, rrset_obj);
Py_DECREF(rrset_obj);
}
}
- return Py_BuildValue("I", result);
+ return (Py_BuildValue("I", result));
} else {
return (NULL);
}
@@ -806,7 +817,7 @@
// object contains a reference to the data source
// The corresponding DECREF is in commit/rollback
Py_INCREF(self);
- return result;
+ return (result);
}
return (NULL);
}
@@ -820,7 +831,7 @@
self->datasrc->commitTransaction(
*(transaction->datasrc_transaction)));
Py_DECREF(self);
- return result;
+ return (result);
}
return (NULL);
}
@@ -834,7 +845,7 @@
self->datasrc->rollbackTransaction(
*(transaction->datasrc_transaction)));
Py_DECREF(self);
- return result;
+ return (result);
}
return (NULL);
}
@@ -847,13 +858,13 @@
if (PyArg_ParseTuple(args, "O!O",
&datasrc_transaction_type, &transaction,
&rrset_obj)) {
- isc::dns::ConstRRsetPtr rrset_ptr = pyRRset_AsRRsetPtr(rrset_obj);
+ isc::dns::ConstRRsetPtr rrset_ptr = PyRRset_AsRRsetPtr(rrset_obj);
PyObject* result = Py_BuildValue("I",
self->datasrc->addRRset(
*(transaction->datasrc_transaction),
rrset_ptr));
- return result;
+ return (result);
}
return (NULL);
@@ -867,13 +878,13 @@
if (PyArg_ParseTuple(args, "O!O",
&datasrc_transaction_type, &transaction,
&rrset_obj)) {
- isc::dns::ConstRRsetPtr rrset_ptr = pyRRset_AsRRsetPtr(rrset_obj);
+ isc::dns::ConstRRsetPtr rrset_ptr = PyRRset_AsRRsetPtr(rrset_obj);
PyObject* result = Py_BuildValue("I",
self->datasrc->delRRset(
*(transaction->datasrc_transaction),
rrset_ptr));
- return result;
+ return (result);
}
return (NULL);
@@ -889,7 +900,7 @@
PyObject* result = Py_BuildValue("I",
self->datasrc->delZone(
*(transaction->datasrc_transaction)));
- return result;
+ return (result);
}
return (NULL);
@@ -911,18 +922,18 @@
isc::dns::RRsetList rrset_list;
for (int i = 0; i < PyList_Size(rrset_list_obj); ++i) {
PyObject* rrset_obj = PyList_GET_ITEM(rrset_list_obj, i);
- if (!pyRRset_Check(rrset_obj)) {
+ if (!PyRRset_Check(rrset_obj)) {
PyErr_SetString(PyExc_TypeError,
"non-RRset object in argument 2 of replace_zone()");
return (NULL);
}
- rrset_list.addRRset(pyRRset_AsRRsetPtr(rrset_obj));
+ rrset_list.addRRset(PyRRset_AsRRsetPtr(rrset_obj));
}
PyObject* result = Py_BuildValue("I",
self->datasrc->replaceZone(
*(transaction->datasrc_transaction),
rrset_list));
- return result;
+ return (result);
}
return (NULL);
}
@@ -935,13 +946,13 @@
if (PyArg_ParseTuple(args, "O!O",
&datasrc_transaction_type, &transaction,
&rrset_obj)) {
- isc::dns::ConstRRsetPtr rrset_ptr = pyRRset_AsRRsetPtr(rrset_obj);
+ isc::dns::ConstRRsetPtr rrset_ptr = PyRRset_AsRRsetPtr(rrset_obj);
PyObject* result = Py_BuildValue("I",
self->datasrc->haveRRset(
*(transaction->datasrc_transaction),
rrset_ptr));
- return result;
+ return (result);
}
return (NULL);
}
@@ -955,11 +966,11 @@
if (PyArg_ParseTuple(args, "O!O!",
&datasrc_transaction_type, &transaction,
rrset_type, &rrset_obj)) {
- isc::dns::ConstRRsetPtr rrset_ptr = pyRRset_AsRRsetPtr(rrset_obj);
+ isc::dns::ConstRRsetPtr rrset_ptr = PyRRset_AsRRsetPtr(rrset_obj);
isc::dns::Rcode rcode = self->datasrc->updateCheckPrerequisite(
*(transaction->datasrc_transaction),
rrset_ptr);
- return pyRcode_FromRcode(rcode);
+ return (PyRcode_FromRcode(rcode));
}
return (NULL);
}
@@ -983,12 +994,12 @@
isc::dns::Message m(isc::dns::Message::RENDER);
for (int i = 0; i < PyList_Size(rrset_list_obj); ++i) {
PyObject* rrset_obj = PyList_GET_ITEM(rrset_list_obj, i);
- if (!pyRRset_Check(rrset_obj)) {
+ if (!PyRRset_Check(rrset_obj)) {
PyErr_SetString(PyExc_TypeError,
"non-RRset object in argument 2 of do_ixfr()");
return (NULL);
}
- m.addRRset(isc::dns::Section::ANSWER(), pyRRset_AsRRsetPtr(rrset_obj), false);
+ m.addRRset(isc::dns::Section::ANSWER(), PyRRset_AsRRsetPtr(rrset_obj), false);
}
PyObject* result = Py_BuildValue("I",
@@ -996,7 +1007,7 @@
*(transaction->datasrc_transaction),
m.beginSection(isc::dns::Section::ANSWER()),
m.endSection(isc::dns::Section::ANSWER())));
- return result;
+ return (result);
}
return (NULL);
}
@@ -1024,12 +1035,18 @@
if (PyArg_ParseTuple(args, "O!O!O!", &datasrc_type, &data_source,
nameType, &po_name,
rrclassType, &po_rrclass)) {
- isc::dns::Name rrname(PyBytes_AS_STRING(PyUnicode_AsEncodedString(PyObject_CallMethod(po_name, "to_text", NULL), "utf-8", "Error")));
- isc::dns::RRClass rrclass(PyLong_AsLong(PyObject_CallMethod(po_rrclass, "get_code", NULL)));
+ isc::dns::Name rrname(PyBytes_AS_STRING(PyUnicode_AsEncodedString(
+ PyObject_CallMethod(po_name,
+ const_cast<char*>("to_text"),
+ NULL),
+ "utf-8", "Error")));
+ isc::dns::RRClass rrclass(PyLong_AsLong(
+ PyObject_CallMethod(po_rrclass,
+ const_cast<char*>("get_code"),
+ NULL)));
self->datasrc_transaction = new DataSrcTransaction(data_source->datasrc,
rrname,
- rrclass
- );
+ rrclass);
return (0);
}
More information about the bind10-changes
mailing list