From fe66df7afac935f7c2e200e8b452ce9da670dcae Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 6 Dec 2014 15:23:23 +0100 Subject: [PATCH] added missing code, formatting --- src/lib/ebus/result.cpp | 51 +++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index 66cea24a..43f850e2 100644 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -24,31 +24,32 @@ using namespace std; const char* getResultCode(result_t resultCode) { switch (resultCode) { - case RESULT_IN_ESC: return "success: escape sequence received"; - case RESULT_SYN: return "success: SYN received"; - case RESULT_ERR_GENERIC_IO: return "ERR: generic I/O error"; - case RESULT_ERR_DEVICE: return "ERR: generic device error"; - case RESULT_ERR_SEND: return "ERR: send error"; - case RESULT_ERR_ESC: return "ERR: invalid escape sequence"; - case RESULT_ERR_TIMEOUT: return "ERR: read timeout"; - case RESULT_ERR_NOTFOUND: return "ERR: file/element not found or not readable"; - case RESULT_ERR_EOF: return "ERR: end of input reached"; - case RESULT_ERR_INVALID_ARG: return "ERR: invalid argument"; - case RESULT_ERR_INVALID_NUM: return "ERR: invalid numeric argument"; - case RESULT_ERR_INVALID_POS: return "ERR: invalid position"; - case RESULT_ERR_OUT_OF_RANGE: return "ERR: argument value out of valid range"; - case RESULT_ERR_INVALID_PART: return "ERR: invalid part type value"; - case RESULT_ERR_MISSING_TYPE: return "ERR: missing data type"; - case RESULT_ERR_INVALID_LIST: return "ERR: invalid value list"; - case RESULT_ERR_DUPLICATE: return "ERR: duplicate entry"; - case RESULT_ERR_BUS_LOST: return "ERR: arbitration lost"; - case RESULT_ERR_CRC: return "ERR: CRC error"; - case RESULT_ERR_ACK: return "ERR: ACK error"; - case RESULT_ERR_NAK: return "ERR: NAK received"; - default: - if (resultCode >= 0) - return "success: unknown result code"; - return "ERR: unknown result code"; + case RESULT_OK: return "success"; + case RESULT_IN_ESC: return "success: escape sequence received"; + case RESULT_SYN: return "success: SYN received"; + case RESULT_ERR_GENERIC_IO: return "ERR: generic I/O error"; + case RESULT_ERR_DEVICE: return "ERR: generic device error"; + case RESULT_ERR_SEND: return "ERR: send error"; + case RESULT_ERR_ESC: return "ERR: invalid escape sequence"; + case RESULT_ERR_TIMEOUT: return "ERR: read timeout"; + case RESULT_ERR_NOTFOUND: return "ERR: file/element not found or not readable"; + case RESULT_ERR_EOF: return "ERR: end of input reached"; + case RESULT_ERR_INVALID_ARG: return "ERR: invalid argument"; + case RESULT_ERR_INVALID_NUM: return "ERR: invalid numeric argument"; + case RESULT_ERR_INVALID_POS: return "ERR: invalid position"; + case RESULT_ERR_OUT_OF_RANGE: return "ERR: argument value out of valid range"; + case RESULT_ERR_INVALID_PART: return "ERR: invalid part type value"; + case RESULT_ERR_MISSING_TYPE: return "ERR: missing data type"; + case RESULT_ERR_INVALID_LIST: return "ERR: invalid value list"; + case RESULT_ERR_DUPLICATE: return "ERR: duplicate entry"; + case RESULT_ERR_BUS_LOST: return "ERR: arbitration lost"; + case RESULT_ERR_CRC: return "ERR: CRC error"; + case RESULT_ERR_ACK: return "ERR: ACK error"; + case RESULT_ERR_NAK: return "ERR: NAK received"; + default: + if (resultCode >= 0) + return "success: unknown result code"; + return "ERR: unknown result code"; } }