Browse Source

[1455] aesthetic changes from review

whitespace, comments, log messages, typos
Jelte Jansen 13 years ago
parent
commit
7a9e741027

+ 1 - 1
src/lib/dns/python/pydnspp.cc

@@ -230,7 +230,7 @@ initModulePart_Name(PyObject* mod) {
                      Py_BuildValue("I", NameComparisonResult::EQUAL));
                      Py_BuildValue("I", NameComparisonResult::EQUAL));
     addClassVariable(name_comparison_result_type, "COMMONANCESTOR",
     addClassVariable(name_comparison_result_type, "COMMONANCESTOR",
                      Py_BuildValue("I", NameComparisonResult::COMMONANCESTOR));
                      Py_BuildValue("I", NameComparisonResult::COMMONANCESTOR));
-    
+
     PyModule_AddObject(mod, "NameComparisonResult",
     PyModule_AddObject(mod, "NameComparisonResult",
         reinterpret_cast<PyObject*>(&name_comparison_result_type));
         reinterpret_cast<PyObject*>(&name_comparison_result_type));
 
 

+ 1 - 1
src/lib/dns/rrset.cc

@@ -51,7 +51,7 @@ AbstractRRset::toText() const {
             getClass() != RRClass::NONE()) {
             getClass() != RRClass::NONE()) {
             isc_throw(EmptyRRset, "toText() is attempted for an empty RRset");
             isc_throw(EmptyRRset, "toText() is attempted for an empty RRset");
         }
         }
-        
+
         s += getName().toText() + " " + getTTL().toText() + " " +
         s += getName().toText() + " " + getTTL().toText() + " " +
              getClass().toText() + " " + getType().toText() + "\n";
              getClass().toText() + " " + getType().toText() + "\n";
         return (s);
         return (s);

+ 8 - 4
src/lib/python/isc/ddns/libddns_messages.mes

@@ -51,7 +51,8 @@ nonterminals.
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 was not satisfied is shown. The client is sent an error response with the
 was not satisfied is shown. The client is sent an error response with the
 given rcode.
 given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'Name is not in use'.
+From RFC2136:
 Name is not in use.  No RR of any type is owned by a
 Name is not in use.  No RR of any type is owned by a
 specified NAME.  Note that this prerequisite IS satisfied by
 specified NAME.  Note that this prerequisite IS satisfied by
 empty nonterminals.
 empty nonterminals.
@@ -66,7 +67,8 @@ the client.
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 was not satisfied is shown. The client is sent an error response with the
 was not satisfied is shown. The client is sent an error response with the
 given rcode.
 given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset does not exist'.
+From RFC2136:
 RRset does not exist.  No RRs with a specified NAME and TYPE
 RRset does not exist.  No RRs with a specified NAME and TYPE
 (in the zone and class denoted by the Zone Section) can exist.
 (in the zone and class denoted by the Zone Section) can exist.
 
 
@@ -74,7 +76,8 @@ RRset does not exist.  No RRs with a specified NAME and TYPE
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 was not satisfied is shown. The client is sent an error response with the
 was not satisfied is shown. The client is sent an error response with the
 given rcode.
 given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset exists (value independent)'.
+From RFC2136:
 RRset exists (value dependent).  A set of RRs with a
 RRset exists (value dependent).  A set of RRs with a
 specified NAME and TYPE exists and has the same members
 specified NAME and TYPE exists and has the same members
 with the same RDATAs as the RRset specified here in this
 with the same RDATAs as the RRset specified here in this
@@ -84,7 +87,8 @@ Section.
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
 was not satisfied is shown. The client is sent an error response with the
 was not satisfied is shown. The client is sent an error response with the
 given rcode.
 given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset exists (value dependent)'.
+From RFC2136:
 RRset exists (value independent).  At least one RR with a
 RRset exists (value independent).  At least one RR with a
 specified NAME and TYPE (in the zone and class specified by
 specified NAME and TYPE (in the zone and class specified by
 the Zone Section) must exist.
 the Zone Section) must exist.

+ 2 - 2
src/lib/python/isc/ddns/tests/session_tests.py

@@ -522,7 +522,7 @@ class SessionTest(unittest.TestCase):
         session = UpdateSession(msg, msg_data, TEST_CLIENT4, zconfig)
         session = UpdateSession(msg, msg_data, TEST_CLIENT4, zconfig)
         # compare the to_text output of the rcodes (nicer error messages)
         # compare the to_text output of the rcodes (nicer error messages)
         # This call itself should also be done by handle(),
         # This call itself should also be done by handle(),
-        # but just for better failures, it is first called on itw own
+        # but just for better failures, it is first called on its own
         self.assertEqual(expected.to_text(),
         self.assertEqual(expected.to_text(),
             session._UpdateSession__check_prerequisites(self.__datasrc_client,
             session._UpdateSession__check_prerequisites(self.__datasrc_client,
                                                         TEST_ZONE_NAME,
                                                         TEST_ZONE_NAME,
@@ -543,7 +543,7 @@ class SessionTest(unittest.TestCase):
         # It does test all types of prerequisites, but it does not test
         # It does test all types of prerequisites, but it does not test
         # every possible result for those types (those are tested above,
         # every possible result for those types (those are tested above,
         # in the specific prerequisite type tests)
         # in the specific prerequisite type tests)
-        
+
         # Let's first define a number of prereq's that should succeed
         # Let's first define a number of prereq's that should succeed
         rrset_exists_yes = isc.dns.RRset(isc.dns.Name("example.org"),
         rrset_exists_yes = isc.dns.RRset(isc.dns.Name("example.org"),
                                          isc.dns.RRClass.ANY(),
                                          isc.dns.RRClass.ANY(),