wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error message if secondary address generation fails

Browse Source
This commit is contained in:
Robert Johansson
2013-07-03 22:20:44 +09:00
parent 31f17ab4c2
commit e1164c87c9
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mbus/mbus-protocol-aux.c
View File

@ -2079,7 +2079,7 @@ mbus_select_secondary_address(mbus_handle * handle, const char *mask)
// (mask). // (mask).
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int int
mbus_probe_secondary_address(mbus_handle * handle, const char *mask, char *matching_addr) mbus_probe_secondary_address(mbus_handle *handle, const char *mask, char *matching_addr)
{ {
int ret; int ret;
mbus_frame reply; mbus_frame reply;
@ -2119,7 +2119,15 @@ mbus_probe_secondary_address(mbus_handle * handle, const char *mask, char *match
if (mbus_frame_type(&reply) != MBUS_FRAME_TYPE_ACK) if (mbus_frame_type(&reply) != MBUS_FRAME_TYPE_ACK)
{ {
snprintf(matching_addr, 17, "%s", mbus_frame_get_secondary_address(&reply)); char *addr = mbus_frame_get_secondary_address(&reply);
if (addr == NULL)
{
// show error message, but procede with scan
MBUS_ERROR("Failed to generate secondary address from M-Bus reply frame: %s\n", mbus_error_str());
}
snprintf(matching_addr, 17, "%s", addr);
if (_mbus_found_event) if (_mbus_found_event)
{ {