Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #621 from t-b/fix-spelling-errors
Browse files Browse the repository at this point in the history
Fix spelling errors
  • Loading branch information
t-b authored Nov 6, 2019
2 parents b2bfef4 + 5f16680 commit b187b7e
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 26 deletions.
Empty file modified cpp_test_suite/environment/setup.sh
100644 → 100755
Empty file.
Empty file modified cpp_test_suite/environment/shutdown.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions cpp_test_suite/event/att_conf_event_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ int main(int argc, char **argv)


//
// Subscribe for attibute configuration events.
// Subscribe for attribute configuration events.
// Set-up the event buffers to keep only the last 5 received events
//
cb.cb_executed = 0;
Expand Down Expand Up @@ -231,7 +231,7 @@ int main(int argc, char **argv)
cout << " unsubscribe_event --> OK" << endl;

//
// Subscribe for attibute configuration events.
// Subscribe for attribute configuration events.
// Set-up the event buffers to keep all received events
//
cb.cb_executed = 0;
Expand Down
2 changes: 1 addition & 1 deletion cpp_test_suite/event/data_ready_event_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ int main(int argc, char **argv)
cout << " unsubscribe_event --> OK" << endl;

//
// Subscribe for attibute configuration events.
// Subscribe for attribute configuration events.
// Set-up the event buffers to keep only the last 5 received events
//

Expand Down
2 changes: 1 addition & 1 deletion cppapi/client/Connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
/**
* Base class for Tango device access
*
* Base class for Tango device access. This class is pure virtual and can be instanciated
* Base class for Tango device access. This class is pure virtual and can be instantiated
* as is.
*
* $Author: taurel $
Expand Down
2 changes: 1 addition & 1 deletion cppapi/client/eventqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ EventQueue::~EventQueue()
}

//
// for attibute configuration events
// for attribute configuration events
//

else
Expand Down
6 changes: 3 additions & 3 deletions cppapi/client/zmqeventconsumer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ void ZmqEventConsumer::process_heartbeat(zmq::message_t &received_event_name,zmq

{
omniORB::logger log;
log << "ZMQ: Endianess" << '\n';
log << "ZMQ: Endianness" << '\n';
}
omni::giopStream::dumpbuf((unsigned char *)received_endian.data(),received_endian.size());

Expand Down Expand Up @@ -537,7 +537,7 @@ void ZmqEventConsumer::process_event(zmq::message_t &received_event_name,zmq::me

{
omniORB::logger log;
log << "ZMQ: Endianess" << '\n';
log << "ZMQ: Endianness" << '\n';
}
omni::giopStream::dumpbuf((unsigned char *)received_endian.data(),received_endian.size());

Expand Down Expand Up @@ -615,7 +615,7 @@ void ZmqEventConsumer::process_event(zmq_msg_t &received_event_name,zmq_msg_t &r

{
omniORB::logger log;
log << "ZMQ: Endianess" << '\n';
log << "ZMQ: Endianness" << '\n';
}
omni::giopStream::dumpbuf((unsigned char *)zmq_msg_data(&received_endian),zmq_msg_size(&received_endian));

Expand Down
6 changes: 3 additions & 3 deletions cppapi/server/attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ class Attribute
/**
* Fire a change event for the attribute value. The event is pushed to the notification
* daemon.
* The attibute data must be set with one of the Attribute::set_value or
* The attribute data must be set with one of the Attribute::set_value or
* Attribute::setvalue_date_quality methods before fireing the event.
* The event is triggered with or without the change event criteria depending
* on the configuration choosen with set_change_event().
Expand Down Expand Up @@ -1652,7 +1652,7 @@ class Attribute
/**
* Fire an archive event for the attribute value. The event is pushed to the notification
* daemon.
* The attibute data must be set with one of the Attribute::set_value or
* The attribute data must be set with one of the Attribute::set_value or
* Attribute::setvalue_date_quality methods before fireing the event.
* The event is triggered with or without the archive event criteria depending
* on the configuration choosen with set_archive_event().
Expand Down Expand Up @@ -1724,7 +1724,7 @@ class Attribute
/**
* Fire a user event for the attribute value. The event is pushed to the notification
* daemon.
* The attibute data must be set with one of the Attribute::set_value or
* The attribute data must be set with one of the Attribute::set_value or
* Attribute::setvalue_date_quality methods before fireing the event.
* ATTENTION: The couple set_value() and fire_event() needs to be protected
* against concurrent accesses to the same attribute. Such an access might happen during
Expand Down
2 changes: 1 addition & 1 deletion cppapi/server/attribute_spec.tpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define _ATTRIBUTE_SPEC_TPP

//
// These methods are in a sepearte files because I did not find a way to explicitely instanciate specialized
// These methods are in a sepearte files because I did not find a way to explicitely instantiate specialized
// templates. Therefore, for template management we have three files:
// 1 - A file with explicit template instanciation (templ_inst.cpp)
// 2 - A file with template method definition (attribute.tpp for Attribute class)
Expand Down
2 changes: 1 addition & 1 deletion cppapi/server/device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ char *DeviceImpl::status()
try
{
AutoTangoMonitor sync(this);
cout4 << "DeviceImpl::status (attibute) arrived" << endl;
cout4 << "DeviceImpl::status (attribute) arrived" << endl;

//
// Write the device name into the per thread data for
Expand Down
4 changes: 2 additions & 2 deletions cppapi/server/devicelog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ log4tango::Logger* DeviceImpl::get_logger_i (void)
try {
// trace
cout4 << "Entering DeviceImpl::get_logger_i" << endl;
// instanciate the logger (
// instantiate the logger (
// shame on me for a such huggly impl. but polymorphism
// can't be used here !
if (logger == 0) {
Expand All @@ -134,7 +134,7 @@ log4tango::Logger* DeviceImpl::get_logger_i (void)
dev_name.end(),
dev_name.begin(),
::tolower);
// instanciate the logger using device name
// instantiate the logger using device name
logger = new log4tango::Logger(dev_name);
if (logger == 0) {
logger = Logging::get_core_logger();
Expand Down
2 changes: 1 addition & 1 deletion cppapi/server/jpeg/jpeg_decoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ char *jpeg_get_error_msg(int code) {
case 11: sprintf(retMsg,"Bad DHT index");break;
case 12: sprintf(retMsg,"Bad SOS marker");break;
case 13: sprintf(retMsg,"Bad component id");break;
case 14: sprintf(retMsg,"Only 8 bit precission supported");break;
case 14: sprintf(retMsg,"Only 8 bit precision supported");break;
case 15: sprintf(retMsg,"Invalid image size (8192x8192 max)");break;
case 16: sprintf(retMsg,"Too many components in frame");break;
case 17: sprintf(retMsg,"Bad SOF marker");break;
Expand Down
8 changes: 4 additions & 4 deletions cppapi/server/logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void Logging::init (const std::string& ds_name, // dserver name
_VERBOSE(("\tTANGO_LOG_PATH is %s\n", Logging::_log_path.c_str()));
// build logger name from dserver name
std::string dserver_dev_name("dserver/" + ds_name);
// instanciate the logger
// instantiate the logger
log4tango::Logger* logger = new log4tango::Logger(dserver_dev_name);
// is logging level set from cmd line?
bool level_set_from_cmd_line = (cmd_line_level >= kTANGO_CORE_CMD_LINE_LEVEL)
Expand Down Expand Up @@ -410,7 +410,7 @@ void Logging::add_logging_target(log4tango::Logger* logger,
log4tango::Appender* appender = logger->get_appender(appender_name);
if (!appender) {
cout4 << "Adding logging target " << appender_name << " to " << logger->get_name() << endl;
// instanciate the appender (i.e. the target) and the layout (if needed)
// instantiate the appender (i.e. the target) and the layout (if needed)
switch (ltg_type) {
case LOG_CONSOLE: {
appender = new CoutAppender(appender_name);
Expand Down Expand Up @@ -687,13 +687,13 @@ Tango::DevVarStringArray* Logging::get_logging_target (const std::string& dev_na
log4tango::Logger *logger = dev->get_logger();
if (logger == 0) {
TangoSys_OMemStream o;
o << "Could not instanciate logger (out of memory error)" << ends;
o << "Could not instantiate logger (out of memory error)" << ends;
Except::throw_exception((const char *)API_MemoryAllocation, o.str(),
(const char *)"Logging::get_logging_target");
}
// get logger's appender list
log4tango::AppenderList al = logger->get_all_appenders();
// instanciate the returned value
// instantiate the returned value
ret = new Tango::DevVarStringArray(al.size());
if (ret == 0) {
TangoSys_OMemStream o;
Expand Down
4 changes: 2 additions & 2 deletions cppapi/server/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class Util
*
* This method returns a reference to the object of the Util class.
* If the class singleton object has not been created, it will be
* instanciated
* instantiated
*
* @param argc The process command line argument number
* @param argv The process commandline arguments
Expand All @@ -179,7 +179,7 @@ class Util
*
* This method returns a reference to the object of the Util class.
* If the class singleton object has not been created, it will be
* instanciated. This method must be used only for non-console mode windows
* instantiated. This method must be used only for non-console mode windows
* device server
*
* @param AppInst The application instance
Expand Down
4 changes: 2 additions & 2 deletions cppapi/server/utils_polling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ void Util::check_pool_conf(DServer *admin_dev,unsigned long pool_size)
vector<string> mod_conf = poll_pool_conf;

//
// First, get the list of devices instanciated in this server and check if the polled devices are defined within
// First, get the list of devices instantiated in this server and check if the polled devices are defined within
// the server
//

Expand Down Expand Up @@ -1282,7 +1282,7 @@ void Util::check_pool_conf(DServer *admin_dev,unsigned long pool_size)
continue;

//
// Check if the device is instanciated in this server
// Check if the device is instantiated in this server
//

string entry_lower(*iter_entry);
Expand Down
4 changes: 2 additions & 2 deletions cppapi/server/zmqeventsupplier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ void ZmqEventSupplier::push_heartbeat_event()

{
omniORB::logger log;
log << "ZMQ: Endianess" << '\n';
log << "ZMQ: Endianness" << '\n';
}
omni::giopStream::dumpbuf((unsigned char *)endian_mess_heartbeat.data(),endian_mess_heartbeat.size());

Expand Down Expand Up @@ -1336,7 +1336,7 @@ void ZmqEventSupplier::push_event(DeviceImpl *device_impl,string event_type,

{
omniORB::logger log;
log << "ZMQ: Endianess" << '\n';
log << "ZMQ: Endianness" << '\n';
}
omni::giopStream::dumpbuf((unsigned char *)endian_mess.data(),endian_mess.size());

Expand Down

0 comments on commit b187b7e

Please sign in to comment.