Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ x/y/2019 ola-0.10.8
* Fix compatibility with Protobuf 3.7 and newer (tested with up to 3.12.2)
* Rename CircularDepdendancyException(sic) to CircularDependencyException in
the Python RDM Test code, also the relevant comments
* Fix a minor longstanding logging bug with Avahi subtype registration errors

Internal:
* Replace "readdir_r" with "readdir" since the former has been deprecated
Expand Down
4 changes: 2 additions & 2 deletions include/ola/base/Flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* Features:
* - bool, uint8, uint16, uint32, int8, int16, int32 & string types.
* - short options (e.g. -x).
* - inverted bools, e.g. --no-foo
* - inverted bools, e.g. \--no-foo
*
* @note
* - Setting flags is not thread safe
Expand All @@ -44,7 +44,7 @@
* --name is simon
* --baz (-b) is 0
* @endcode
* Compare with <tt>./flags --foo --name bob -b 10 --nobar</tt>
* Compare with <tt>./flags \--foo \--name bob -b 10 \--no-bar</tt>
* @code
* --foo is 1
* --bar is 0
Expand Down
2 changes: 1 addition & 1 deletion include/ola/io/SelectServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace io {
* @snippet udp_server.cpp UDP Server
*
* The SelectServer has a number of different implementations depending on the
* platform. On systems with epoll, the flag --no-use-epoll will disable the
* platform. On systems with epoll, the flag \--no-use-epoll will disable the
* use of epoll(), reverting to select(). The PollerInterface defines the
* contract between the SelectServer and the lower level, platform dependent
* Poller classes.
Expand Down
8 changes: 4 additions & 4 deletions olad/AvahiDiscoveryAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void AvahiDiscoveryAgent::GroupStateChanged(const string &service_key,
break;
case AVAHI_ENTRY_GROUP_FAILURE:
OLA_WARN << "Failed to register " << service_key
<< " " << avahi_strerror(avahi_client_errno(m_client));
<< ": " << avahi_strerror(avahi_client_errno(m_client));
break;
case AVAHI_ENTRY_GROUP_UNCOMMITED:
case AVAHI_ENTRY_GROUP_REGISTERING:
Expand Down Expand Up @@ -338,8 +338,8 @@ bool AvahiDiscoveryAgent::InternalRegisterService(ServiceEntry *service) {
AVAHI_PROTO_INET, static_cast<AvahiPublishFlags>(0),
service->actual_service_name.c_str(), service->type().c_str(), NULL,
sub_type.c_str());
if (!r) {
OLA_WARN << "Failed to add " << sub_type;
if (r) {
OLA_WARN << "Failed to add " << sub_type << ": " << avahi_strerror(r);
}
}
}
Expand Down Expand Up @@ -368,7 +368,7 @@ void AvahiDiscoveryAgent::CreateNewClient() {
if (m_client) {
m_backoff.Reset();
} else {
OLA_WARN << "Failed to create Avahi client " << avahi_strerror(error);
OLA_WARN << "Failed to create Avahi client: " << avahi_strerror(error);
SetUpReconnectTimeout();
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/e133/e133-controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* e133-controller.cpp
* Copyright (C) 2011 Simon Newton
*
* This connects to the device specified in --target.
* This connects to the device specified in \--target.
*
* It then sends some RDM commands to the E1.33 node and waits for the
* response.
Expand Down
2 changes: 1 addition & 1 deletion tools/e133/e133-monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* e133-monitor.cpp
* Copyright (C) 2011 Simon Newton
*
* This opens a TCP connection to each device in --targets.
* This opens a TCP connection to each device in \--targets.
*
* It then waits to receive E1.33 messages on the TCP connections.
*/
Expand Down