From f8b10ab003afcc498190630a136bc719e93c22d0 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 16 Apr 2014 16:53:49 +0400 Subject: [PATCH] Shorter error strings - saves ~200 bytes --- libuavcan/include/uavcan/marshal/array.hpp | 4 ++-- libuavcan/include/uavcan/node/global_data_type_registry.hpp | 5 +++-- libuavcan/include/uavcan/node/service_client.hpp | 2 +- libuavcan/include/uavcan/node/service_server.hpp | 2 +- libuavcan/include/uavcan/node/subscriber.hpp | 2 +- libuavcan/include/uavcan/util/lazy_constructor.hpp | 4 ++-- libuavcan/include/uavcan/util/method_binder.hpp | 2 +- libuavcan/src/protocol/uc_global_time_sync_master.cpp | 4 ++-- libuavcan/src/protocol/uc_node_status_monitor.cpp | 2 +- libuavcan/src/protocol/uc_node_status_provider.cpp | 2 +- libuavcan/src/protocol/uc_panic_broadcaster.cpp | 2 +- libuavcan/src/transport/uc_can_io.cpp | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/libuavcan/include/uavcan/marshal/array.hpp b/libuavcan/include/uavcan/marshal/array.hpp index 70ec5d02a7..03433bbd44 100644 --- a/libuavcan/include/uavcan/marshal/array.hpp +++ b/libuavcan/include/uavcan/marshal/array.hpp @@ -543,7 +543,7 @@ public: Base::clear(); if (ch == NULL) { - handleFatalError("Null pointer in Array<>::operator=(const char*)"); + handleFatalError("Array::operator=(const char*)"); } while (*ch) { @@ -558,7 +558,7 @@ public: StaticAssert::check(); if (ch == NULL) { - handleFatalError("Null pointer in Array<>::operator+=(const char*)"); + handleFatalError("Array::operator+=(const char*)"); } while (*ch) { diff --git a/libuavcan/include/uavcan/node/global_data_type_registry.hpp b/libuavcan/include/uavcan/node/global_data_type_registry.hpp index 8542e43aad..43350ce6f4 100644 --- a/libuavcan/include/uavcan/node/global_data_type_registry.hpp +++ b/libuavcan/include/uavcan/node/global_data_type_registry.hpp @@ -124,7 +124,7 @@ struct UAVCAN_EXPORT DefaultDataTypeRegistrator if (res != GlobalDataTypeRegistry::RegistResultOk) { - handleFatalError("Type registration failed"); + handleFatalError("Type reg failed"); } } }; @@ -164,7 +164,8 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::regist(DataTypeID i return remove_res; } } - new (storage.buffer) Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), Type::getDataTypeFullName()); + new (storage.buffer) Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), + Type::getDataTypeFullName()); { const RegistResult remove_res = remove(entry); if (remove_res != RegistResultOk) diff --git a/libuavcan/include/uavcan/node/service_client.hpp b/libuavcan/include/uavcan/node/service_client.hpp index 7cc0dac1b1..6d8fa138cf 100644 --- a/libuavcan/include/uavcan/node/service_client.hpp +++ b/libuavcan/include/uavcan/node/service_client.hpp @@ -187,7 +187,7 @@ void ServiceClient::invokeCallback(ServiceCallResultType& } else { - handleFatalError("Invalid caller callback"); + handleFatalError("Srv client clbk"); } } diff --git a/libuavcan/include/uavcan/node/service_server.hpp b/libuavcan/include/uavcan/node/service_server.hpp index 62269e4c0c..22898b1b96 100644 --- a/libuavcan/include/uavcan/node/service_server.hpp +++ b/libuavcan/include/uavcan/node/service_server.hpp @@ -61,7 +61,7 @@ private: } else { - handleFatalError("Invalid service server callback"); + handleFatalError("Srv serv clbk"); } const int res = publisher_.publish(response_, TransferTypeServiceResponse, request.getSrcNodeID(), diff --git a/libuavcan/include/uavcan/node/subscriber.hpp b/libuavcan/include/uavcan/node/subscriber.hpp index ff53651fe6..a6bb9b6c12 100644 --- a/libuavcan/include/uavcan/node/subscriber.hpp +++ b/libuavcan/include/uavcan/node/subscriber.hpp @@ -50,7 +50,7 @@ private: } else { - handleFatalError("Invalid subscriber callback"); + handleFatalError("Sub clbk"); } } diff --git a/libuavcan/include/uavcan/util/lazy_constructor.hpp b/libuavcan/include/uavcan/util/lazy_constructor.hpp index a00f014e90..784474dd6d 100644 --- a/libuavcan/include/uavcan/util/lazy_constructor.hpp +++ b/libuavcan/include/uavcan/util/lazy_constructor.hpp @@ -31,7 +31,7 @@ class UAVCAN_EXPORT LazyConstructor { if (!ptr_) { - handleFatalError("LazyConstructor is not constructed"); + handleFatalError("LazyConstructor"); } } @@ -39,7 +39,7 @@ class UAVCAN_EXPORT LazyConstructor { if (ptr_) { - handleFatalError("LazyConstructor is already constructed"); + handleFatalError("LazyConstructor"); } } diff --git a/libuavcan/include/uavcan/util/method_binder.hpp b/libuavcan/include/uavcan/util/method_binder.hpp index 92d28b8495..e2c711e734 100644 --- a/libuavcan/include/uavcan/util/method_binder.hpp +++ b/libuavcan/include/uavcan/util/method_binder.hpp @@ -21,7 +21,7 @@ class UAVCAN_EXPORT MethodBinder { if (!operator bool()) { - handleFatalError("Null method binder"); + handleFatalError("Null binder"); } } diff --git a/libuavcan/src/protocol/uc_global_time_sync_master.cpp b/libuavcan/src/protocol/uc_global_time_sync_master.cpp index 5d96c41bc2..3d37189759 100644 --- a/libuavcan/src/protocol/uc_global_time_sync_master.cpp +++ b/libuavcan/src/protocol/uc_global_time_sync_master.cpp @@ -30,13 +30,13 @@ void GlobalTimeSyncMaster::IfaceMaster::setTxTimestamp(UtcTime ts) if (ts.isZero()) { assert(0); - pub_.getNode().registerInternalFailure("GlobalTimeSyncMaster got zero UTC TX timestamp"); + pub_.getNode().registerInternalFailure("GlobalTimeSyncMaster zero TX ts"); return; } if (!prev_tx_utc_.isZero()) { prev_tx_utc_ = UtcTime(); // Reset again, because there's something broken in the driver and we don't trust it - pub_.getNode().registerInternalFailure("GlobalTimeSyncMaster publication conflict"); + pub_.getNode().registerInternalFailure("GlobalTimeSyncMaster pub conflict"); return; } prev_tx_utc_ = ts; diff --git a/libuavcan/src/protocol/uc_node_status_monitor.cpp b/libuavcan/src/protocol/uc_node_status_monitor.cpp index 5f8d63821a..bbe982f6f7 100644 --- a/libuavcan/src/protocol/uc_node_status_monitor.cpp +++ b/libuavcan/src/protocol/uc_node_status_monitor.cpp @@ -15,7 +15,7 @@ NodeStatusMonitor::Entry& NodeStatusMonitor::getEntry(NodeID node_id) const { if (node_id.get() < 1 || node_id.get() > NodeID::Max) { - handleFatalError("NodeStatusMonitor NodeID out of range"); + handleFatalError("NodeStatusMonitor NodeID"); } return entries_[node_id.get() - 1]; } diff --git a/libuavcan/src/protocol/uc_node_status_provider.cpp b/libuavcan/src/protocol/uc_node_status_provider.cpp index 67b0ef37c0..2552b041f9 100644 --- a/libuavcan/src/protocol/uc_node_status_provider.cpp +++ b/libuavcan/src/protocol/uc_node_status_provider.cpp @@ -31,7 +31,7 @@ void NodeStatusProvider::publishWithErrorHandling() const int res = publish(); if (res < 0) { - getNode().registerInternalFailure("NodeStatus publication failed"); + getNode().registerInternalFailure("NodeStatus pub failed"); } } diff --git a/libuavcan/src/protocol/uc_panic_broadcaster.cpp b/libuavcan/src/protocol/uc_panic_broadcaster.cpp index 1be2762bc3..30d02f4fa1 100644 --- a/libuavcan/src/protocol/uc_panic_broadcaster.cpp +++ b/libuavcan/src/protocol/uc_panic_broadcaster.cpp @@ -13,7 +13,7 @@ void PanicBroadcaster::publishOnce() const int res = pub_.broadcast(msg_); if (res < 0) { - pub_.getNode().registerInternalFailure("Panic broadcasting failure"); + pub_.getNode().registerInternalFailure("Panic pub failed"); } } diff --git a/libuavcan/src/transport/uc_can_io.cpp b/libuavcan/src/transport/uc_can_io.cpp index 990d0e4345..c3d5b42062 100644 --- a/libuavcan/src/transport/uc_can_io.cpp +++ b/libuavcan/src/transport/uc_can_io.cpp @@ -294,7 +294,7 @@ CanIOManager::CanIOManager(ICanDriver& driver, IPoolAllocator& allocator, ISyste { if (num_ifaces_ < 1 || num_ifaces_ > MaxCanIfaces) { - handleFatalError("Wrong number of CAN ifaces"); + handleFatalError("Num ifaces"); } if (mem_blocks_per_iface == 0)