Commit 72b8ac61 authored by Jeremy C. Reed's avatar Jeremy C. Reed

[master] various more typo and misspelling fixes

Some slight grammar changes.
Mostly in comments, but some for api docs.
Changes a isc_throw output too.

Reviewed via jabber.
parent a45069df
......@@ -329,8 +329,8 @@ public:
/// \short Bad zone data encountered.
///
/// This is thrown when process encounteres misconfigured zone in a way
/// it can't continue. This throws, not sets the Rcode, because such
/// This is thrown when a process encounters a misconfigured zone in a
/// way it can't continue. This throws, not sets the Rcode, because such
/// misconfigured zone should not be present in the data source and
/// should have been rejected sooner.
struct BadZone : public isc::Exception {
......
......@@ -151,7 +151,7 @@ class ProcessInfo:
"""Function used before running a program that needs to run as a
different user."""
# First, put us into a separate process group so we don't get
# SIGINT signals on Ctrl-C (b10-init will shut everthing down by
# SIGINT signals on Ctrl-C (b10-init will shut everything down by
# other means).
os.setpgrp()
......
......@@ -142,7 +142,7 @@ class DatasrcTest(unittest.TestCase):
def test_no_such_file_mem(self):
"""
We also check the existance of master files. Not the actual content,
We also check the existence of master files. Not the actual content,
though.
"""
self.reject({"IN": [{
......
......@@ -354,7 +354,7 @@ class DDNSServer:
zname = Name(zone_spec['name'])
# class has the default value in case it's unspecified.
# ideally this should be merged within the config module, but
# the current implementation doesn't esnure that, so we need to
# the current implementation doesn't ensure that, so we need to
# subsitute it ourselves.
if 'class' in zone_spec:
zclass = RRClass(zone_spec['class'])
......@@ -510,7 +510,7 @@ class DDNSServer:
'''Send DDNS response to the client.
Right now, this is a straightforward subroutine of handle_request(),
but is intended to be extended evetually so that it can handle more
but is intended to be extended eventually so that it can handle more
complicated operations for TCP (which requires asynchronous write).
Further, when we support multiple requests over a single TCP
connection, this method may even be shared by multiple methods.
......
......@@ -141,7 +141,7 @@ logged.
% DDNS_RESPONSE_TCP_SOCKET_SEND_FAILED failed to complete sending update response to %1 over TCP
b10-ddns had tried to send an update response over TCP, and it hadn't
been completed at that time, and a followup attempt to complete the
been completed at that time, and a follow-up attempt to complete the
send operation failed due to some network I/O error. While a network
error can happen any time, this event is quite unexpected for two
reasons. First, since the size of a response to an update request
......
......@@ -53,7 +53,7 @@ echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics"
echo "I:test master file RFC1035 TTL and \$TTL semantics"
echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL semantics"
echo "I:test master file RFC1035 TTL and mixed \$INCLUDE with \$TTL semantics"
echo "I:test master file BIND9 extenstion of TTL"
echo "I:test master file BIND9 extension of TTL"
echo "I:test master file RFC1035 missing CLASS, TTL, NAME semantics"
echo "I:test master file comments"
......
......@@ -11,7 +11,7 @@ ns A 10.53.0.1
a TXT "soa minttl 3"
b 2S TXT "explicit ttl 2"
c TXT "soa minttl 3"
$TTL 10M ; bind9 extention ttl
$TTL 10M ; bind9 extension ttl
d TXT "default ttl 600"
e 4 TXT "explicit ttl 4"
f TXT "default ttl 600"
......@@ -35,7 +35,7 @@ must be a socket, not pipe.
The answer to this is either 'S' directly followed by the socket (using
sendmsg) if it is successful. If it fails, 'E' is returned instead, followed
by either 'S' or 'B' (either socket() or bind() call failed). Then there is
one int (architecture-dependent length and endianess), which is the errno
one int (architecture-dependent length and endianness), which is the errno
value after the failure.
The creator may also send these messages at any time (but not in the middle
......
......@@ -85,7 +85,7 @@ typedef int (*close_t)(int);
/// \param type The type of socket to create (SOCK_STREAM, SOCK_DGRAM, etc).
/// \param bind_addr The address to bind.
/// \param addr_len The actual length of bind_addr.
/// \param close_fun The furction used to close a socket if there's an error
/// \param close_fun The function used to close a socket if there's an error
/// after the creation.
///
/// \return The file descriptor of the newly created socket, if everything
......
......@@ -48,7 +48,7 @@ class SignalHandler():
signal.signal(signal.SIGALRM, self.orig_handler)
def sig_handler(self, signal, frame):
"""envokes unittest.TestCase.fail as a signal handler"""
"""invokes unittest.TestCase.fail as a signal handler"""
self.fail_handler("A deadlock might be detected")
def send_command(command_name, module_name, params=None):
......
......@@ -2421,7 +2421,7 @@ class TestXfrin(unittest.TestCase):
# there can be one more outstanding transfer.
self.assertEqual(self.xfr.command_handler("retransfer",
self.args)['result'][0], 0)
# make sure the # xfrs would excceed the quota
# make sure the # xfrs would exceed the quota
self.xfr.recorder.increment(Name(str(self.xfr._max_transfers_in) + TEST_ZONE_NAME_STR))
# this one should fail
self.assertEqual(self.xfr.command_handler("retransfer",
......
......@@ -1097,7 +1097,7 @@ def __process_xfrin(server, zone_name, rrclass, db_file,
if db_file is not None:
# temporary hardcoded sqlite initialization. Once we decide on
# the config specification, we need to update this (TODO)
# this may depend on #1207, or any followup ticket created for #1207
# this may depend on #1207, or any follow-up ticket created for #1207
datasrc_type = "sqlite3"
datasrc_config = "{ \"database_file\": \"" + db_file + "\"}"
datasrc_client = DataSourceClient(datasrc_type, datasrc_config)
......
......@@ -32,7 +32,7 @@ namespace asiodns {
/// via its constructor.
///
/// A DNS Answer provider function takes answer data that has been obtained
/// from a DNS Lookup provider functon and readies it to be sent to the
/// from a DNS Lookup provider function and readies it to be sent to the
/// client. After it has run, the OutputBuffer object passed to it should
/// contain the answer to the query rendered into wire format.
class DNSAnswer {
......
......@@ -71,7 +71,7 @@ public:
/// without losing access to derived class data.
///
//@{
/// \brief The funtion operator
/// \brief The function operator
virtual void operator()(asio::error_code ec = asio::error_code(),
size_t length = 0)
{
......
......@@ -100,7 +100,7 @@ public:
return (asio_endpoint_.protocol().family());
}
// This is not part of the exosed IOEndpoint API but allows
// This is not part of the exposed IOEndpoint API but allows
// direct access to the ASIO implementation of the endpoint
inline const asio::ip::tcp::endpoint& getASIOEndpoint() const {
return (asio_endpoint_);
......
......@@ -14,7 +14,7 @@
/// \brief Test of TCPSocket
///
/// Tests the fuctionality of a TCPSocket by working through an open-send-
/// Tests the functionality of a TCPSocket by working through an open-send-
/// receive-close sequence and checking that the asynchronous notifications
/// work.
......
......@@ -14,7 +14,7 @@
/// \brief Test of UDPSocket
///
/// Tests the fuctionality of a UDPSocket by working through an open-send-
/// Tests the functionality of a UDPSocket by working through an open-send-
/// receive-close sequence and checking that the asynchronous notifications
/// work.
......
......@@ -100,7 +100,7 @@ public:
return (asio_endpoint_.protocol().family());
}
// This is not part of the exosed IOEndpoint API but allows
// This is not part of the exposed IOEndpoint API but allows
// direct access to the ASIO implementation of the endpoint
inline const asio::ip::udp::endpoint& getASIOEndpoint() const {
return (asio_endpoint_);
......
......@@ -293,7 +293,7 @@ TEST_F(SessionTest, run_with_handler_timeout) {
msg = isc::data::Element::fromJSON("{ \"a third\": \"message\" }");
tds->sendmsg(env, msg);
// No followup message, should time out.
// No follow-up message, should time out.
ASSERT_THROW(my_io_service.run(), SessionTimeout);
}
......
......@@ -53,7 +53,7 @@ protected:
// upon creation of a ModuleCCSession, the class
// sends its specification to the config manager.
// it expects an ok answer back, so everytime we
// it expects an ok answer back, so every time we
// create a ModuleCCSession, we must set an initial
// ok answer.
session.getMessages()->add(createAnswer());
......
......@@ -1003,7 +1003,7 @@ TYPED_TEST(ReloadTest, reloadNoSuchZone) {
TYPED_TEST(ReloadTest, reloadZoneGone) {
this->list_->configure(this->config_elem_, true);
const Name name("example.org");
// We put in a cache for non-existant zone. This emulates being loaded
// We put in a cache for non-existent zone. This emulates being loaded
// and then the zone disappearing. We prefill the cache, so we can check
// it.
this->prepareCache(0, name);
......
......@@ -2566,7 +2566,7 @@ TEST_P(DatabaseClientTest, wildcard) {
doFindTest(*finder, isc::dns::Name("a.*.wild.example.org"),
qtype_, qtype_, rrttl_, ZoneFinder::NXDOMAIN,
expected_rdatas_, expected_sig_rdatas_);
// These should be canceled, since it is below a domain which exitsts
// These should be canceled, since it is below a domain which exists
doFindTest(*finder, isc::dns::Name("nothing.here.wild.example.org"),
qtype_, qtype_, rrttl_, ZoneFinder::NXDOMAIN,
expected_rdatas_, expected_sig_rdatas_);
......
......@@ -292,7 +292,7 @@ protected:
* \param zone_finder Check different InMemoryZoneFinder object than
* zone_finder_ (if NULL, uses zone_finder_)
* \param check_wild_answer Checks that the answer has the same RRs, type
* class and TTL as the eqxpected answer and that the name corresponds
* class and TTL as the expected answer and that the name corresponds
* to the one searched. It is meant for checking answers for wildcard
* queries.
*/
......
......@@ -205,7 +205,7 @@ public:
// is consistent with an option definition.
checkDataType<T>(index);
// When we created the buffer we have checked that it has a
// valid size so this condition here should be always fulfiled.
// valid size so this condition here should be always fulfilled.
assert(buffers_[index].size() == OptionDataTypeTraits<T>::len);
// Read an integer value.
return (OptionDataTypeUtil::readInt<T>(buffers_[index]));
......
......@@ -441,7 +441,7 @@ protected:
/// @brief interface index
///
/// Each network interface has assigned unique ifindex. It is functional
/// equvalent of name, but sometimes more useful, e.g. when using crazy
/// equivalent of name, but sometimes more useful, e.g. when using crazy
/// systems that allow spaces in interface names e.g. MS Windows)
uint32_t ifindex_;
......
......@@ -365,7 +365,7 @@ protected:
/// @brief interface index
///
/// interface index (each network interface has assigned unique ifindex
/// it is functional equvalent of name, but sometimes more useful, e.g.
/// it is functional equivalent of name, but sometimes more useful, e.g.
/// when using crazy systems that allow spaces in interface names
/// e.g. windows
int ifindex_;
......
......@@ -952,7 +952,7 @@ TEST_F(IfaceMgrTest, socketInfo) {
/// @brief parses text representation of MAC address
///
/// This function parses text representation of a MAC address and stores
/// it in binary format. Text format is expecte to be separate with
/// it in binary format. Text format is expected to be separate with
/// semicolons, e.g. f4:6d:04:96:58:f2
///
/// TODO: IfaceMgr::Iface::mac_ uses uint8_t* type, should be vector<uint8_t>
......
......@@ -174,7 +174,7 @@ TEST_F(Option4AddrLstTest, assembly1) {
BadValue
);
if (opt) {
// test failed. Execption was not thrown, but option was created instead.
// test failed. Exception was not thrown, but option was created instead.
delete opt;
}
}
......@@ -218,7 +218,7 @@ TEST_F(Option4AddrLstTest, assembly4) {
BadValue
);
if (opt) {
// test failed. Execption was not thrown, but option was created instead.
// test failed. Exception was not thrown, but option was created instead.
delete opt;
}
}
......
......@@ -831,7 +831,7 @@ private:
/// @brief Fetch and Release MySQL Results
///
/// When a MySQL statement is exected, to fetch the results the function
/// When a MySQL statement is expected, to fetch the results the function
/// mysql_stmt_fetch() must be called. As well as getting data, this
/// allocates internal state. Subsequent calls to mysql_stmt_fetch can be
/// made, but when all the data is retrieved, mysql_stmt_free_result must be
......
......@@ -43,7 +43,7 @@ b10LoggerSeverity(isc::log::Severity defseverity) {
return (defseverity);
}
// Get the debug level. This is defined by the envornment variable
// Get the debug level. This is defined by the environment variable
// B10_LOGGER_DBGLEVEL. If not defined, a default value passed to the function
// is returned.
int
......
......@@ -101,7 +101,7 @@ protected:
/**
* \short Function returning a new zone.
*
* Convenience funcion, just creating a new zone, to shorten the code.
* Convenience function, just creating a new zone, to shorten the code.
*/
boost::shared_ptr<InheritedZoneEntry> getZone() {
return (boost::shared_ptr<InheritedZoneEntry>(new InheritedZoneEntry(
......
......@@ -125,7 +125,7 @@ protected:
// Which nameservers didn't have any of our callbacks yet
std::set<NameserverPtr> nameservers_not_asked_;
/*
* Callbacks. For each fimily type one vector, so we can process
* Callbacks. For each family type one vector, so we can process
* them separately.
*/
std::vector<boost::shared_ptr<AddressRequestCallback> >
......@@ -139,7 +139,7 @@ private:
/**
* \short Process all the callbacks that can be processed
*
* The purpose of this funtion is to ask all nameservers for their IP
* The purpose of this function is to ask all nameservers for their IP
* addresses and execute all callbacks that can be executed. It is
* called whenever new callback appears and there's a chance it could
* be answered or when new information is available (list of nameservers,
......
......@@ -251,7 +251,7 @@ class Creator(Parser):
"""Function used before running a program that needs to run as a
different user."""
# Put us into a separate process group so we don't get
# SIGINT signals on Ctrl-C (b10-init will shut everthing down by
# SIGINT signals on Ctrl-C (b10-init will shut everything down by
# other means).
os.setpgrp()
......
......@@ -357,7 +357,7 @@ class SocketCacheTest(Test):
}
self.__cache._live_tokens = set(['t1', 't2', 't3'])
self.assertEqual([], self._closes)
# We cheat here little bit, the t3 doesn't exist enywhere else, but
# We cheat here little bit, the t3 doesn't exist anywhere else, but
# we need to check the app isn't removed too soon and it shouldn't
# matter anywhere else, so we just avoid the tiresome filling in
self.__cache._active_apps = {1: set(['t1', 't3']), 2: set(['t2'])}
......
......@@ -217,7 +217,7 @@ def set(element, identifier, value):
id, list_indices = split_identifier_list_indices(id_parts[-1])
if list_indices is None:
# value can be an empty list or dict, so check for None eplicitely
# value can be an empty list or dict, so check for None explicitly
if value is not None:
cur_el[id] = value
else:
......@@ -231,7 +231,7 @@ def set(element, identifier, value):
if len(cur_el) <= list_index:
raise DataNotFoundError("List index at " + identifier + " out of range")
cur_el = cur_el[list_index]
# value can be an empty list or dict, so check for None eplicitely
# value can be an empty list or dict, so check for None explicitly
list_index = list_indices[-1]
if type(cur_el) != list:
raise DataTypeError("Element at " + identifier + " is not a list")
......
......@@ -527,7 +527,7 @@ class TestConfigManager(unittest.TestCase):
self.fake_session.get_message("Cmdctl", None))
# but if the 'stopping' module is either unknown or not running,
# no followup message should be sent
# no follow-up message should be sent
self._handle_msg_helper({ "command":
[ "stopping",
{ "module_name": "NoSuchModule" } ] },
......
......@@ -593,7 +593,7 @@ class DataSrcUpdater(unittest.TestCase):
self.assertEqual(finder.NXDOMAIN, result)
def test_update_delete_abort(self):
# we don't do enything with this one, just making sure loading two
# we don't do anything with this one, just making sure loading two
# datasources
dsc = isc.datasrc.DataSourceClient("sqlite3", WRITE_ZONE_DB_CONFIG)
......
......@@ -91,7 +91,7 @@ class DNSTCPSendBuffer:
A Python binary object that corresponds to a part of the TCP
DNS message data starting at the specified position. It may
or may not contain all remaining data from that position.
If the given position is beyond the end of the enrire data,
If the given position is beyond the end of the entire data,
None will be returned.
'''
......@@ -277,4 +277,4 @@ class DNSTCPContext:
if self.__sock is None:
return
self.__sock.close()
self.__sock = None # prevent furhter operation
self.__sock = None # prevent further operation
......@@ -31,7 +31,7 @@ from isc.log_messages.libxfrin_messages import *
class NoSuchZone(Exception):
"""
This is raised if a diff for non-existant zone is being created.
This is raised if a diff for non-existent zone is being created.
"""
pass
......
......@@ -930,7 +930,7 @@ private:
asio::deadline_timer client_timer;
asio::deadline_timer lookup_timer;
// Make FowardQuery deletes itself safely. for more information see
// Make ForwardQuery deletes itself safely. for more information see
// the comments of outstanding_events in RunningQuery.
size_t outstanding_events_;
......
......@@ -243,7 +243,7 @@ TEST_F(SocketRequestorTest, testBadRequestAnswers) {
const std::string max_len(sizeof(sock_un.sun_path) - 1, 'x');
addAnswer("foo", max_len);
// The failure should NOT contain 'too long'
// (explicitly checking for existance of nonexistence of 'too long',
// (explicitly checking for existence of nonexistence of 'too long',
// as opposed to the actual error, since 'too long' is a value we set).
try {
doRequest();
......
......@@ -41,10 +41,10 @@ namespace util {
/// directory specification. Unless this class becomes more widely-used on
/// Windows, there is no point in adding redundant code.
///
/// Name - everthing from the character after the last "/" up to but not
/// Name - everything from the character after the last "/" up to but not
/// including the last ".".
///
/// Extension - everthing from the right-most "." (after the right-most "/") to
/// Extension - everything from the right-most "." (after the right-most "/") to
/// the end of the string. If there is no "." after the last "/", there is
/// no file extension.
///
......
......@@ -14,7 +14,7 @@
/// \brief Test of asiolink utilties
///
/// Tests the fuctionality of the asiolink utilities code by comparing them
/// Tests the functionality of the asiolink utilities code by comparing them
/// with the equivalent methods in isc::dns::[Input/Output]Buffer.
#include <cstddef>
......
......@@ -898,7 +898,7 @@ SQLite version: 3.7.9sourceid version is 2011-11-01 00:52:41 c7c6050ef060877ebe7
</para>
<para>
It should be emphaisized that obtained measurements indicate
It should be emphasized that obtained measurements indicate
only database performance and they cannot be directly
translated to expected leases per second or queries per second
performance by an actual server. The DHCP server must do much
......@@ -1384,7 +1384,7 @@ collected packets: 0
The content in template files is encoded as series of ASCII hexadecimal
digits (each byte represented by two ASCII chars 00..FF). Data in a
template file is laid in network byte order and it can be used on the
systems with different endianess.
systems with different endianness.
perfdhcp forms the packet by replacing parts of the message buffer read
from the file with variable data such as elapsed time, hardware address, DUID
etc. The offsets where such variable data is placed is specific to the
......
......@@ -548,7 +548,7 @@ CommandOptions::decodeDuid(const std::string& base) {
} catch (isc::InvalidParameter&) {
isc_throw(isc::InvalidParameter,
"invalid characters in DUID provided,"
" exepected hex digits");
" expected hex digits");
}
duid_template.push_back(static_cast<uint8_t>(ui));
}
......
......@@ -668,7 +668,7 @@ public:
if (rcvd_packets_num_ == 0) {
std::cout << "Unavailable! No packets received." << std::endl;
}
// We will be using boost::posix_time extensivelly here
// We will be using boost::posix_time extensively here
using namespace boost::posix_time;
// Iterate through all received packets.
......
......@@ -85,7 +85,7 @@ static const size_t DHCPV6_IA_NA_OFFSET = 40;
/// - calculate how many packets must be send to satisfy desired rate,
/// - receive incoming packets from the server,
/// - check the exit conditions - terminate the program if the exit criteria
/// are fulfiled, e.g. reached maximum number of packet drops,
/// are fulfilled, e.g. reached maximum number of packet drops,
/// - send the number of packets appropriate to satisfy the desired rate,
/// - optionally print intermediate reports,
/// - print statistics, e.g. achieved rate,
......@@ -282,14 +282,14 @@ protected:
/// \brief Check if test exit condtitions fulfilled.
///
/// Method checks if the test exit conditions are fulfiled.
/// Method checks if the test exit conditions are fulfilled.
/// Exit conditions are checked periodically from the
/// main loop. Program should break the main loop when
/// this method returns true. It is calling function
/// responsibility to break main loop gracefully and
/// cleanup after test execution.
///
/// \return true if any of the exit conditions is fulfiled.
/// \return true if any of the exit conditions is fulfilled.
bool checkExitConditions() const;
/// \brief Factory function to create DHCPv6 ELAPSED_TIME option.
......@@ -643,7 +643,7 @@ protected:
/// \brief Send DHCPv4 DISCOVER message from template.
///
/// Method sends DHCPv4 DISCOVER message from template. The
/// template data is exepcted to be in binary format. Provided
/// template data is expected to be in binary format. Provided
/// buffer is copied and parts of it are replaced with actual
/// data (e.g. MAC address, transaction id etc.).
/// Copy of sent packet is stored in the stats_mgr4_ object to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment