Commit 45ef3b43 authored by Romuald Conty's avatar Romuald Conty

Fix unused result warnings and add a new NFC_ESOFT error.

parent bfcdb1bd
New in TBD:
API Changes:
* Types
- New NFC_ESOFT error to handle software errors (allocations, pie creation, etc.)
New in 1.6.0-rc1:
API Changes:
......
......@@ -124,7 +124,7 @@ extern "C" {
#define NFC_SUCCESS 0
/** @ingroup error
* @hideinitializer
* Input / output error, device will not be usable anymore
* Input / output error, device may not be usable anymore without re-open it
*/
#define NFC_EIO -1
/** @ingroup error
......@@ -172,6 +172,11 @@ extern "C" {
* Error while RF transmission
*/
#define NFC_ERFTRANS -20
/** @ingroup error
* @hideinitializer
* Software error (allocation, file/pipe creation, etc.)
*/
#define NFC_ESOFT -80
/** @ingroup error
* @hideinitializer
* Device's internal chip error
......
......@@ -586,7 +586,9 @@ acr122s_open(const nfc_connstring connstring)
DRIVER_DATA(pnd)->seq = 0;
#ifndef WIN32
pipe(DRIVER_DATA(pnd)->abort_fds);
if (pipe(DRIVER_DATA(pnd)->abort_fds) < 0) {
return NULL;
}
#else
DRIVER_DATA(pnd)->abort_flag = false;
#endif
......@@ -704,7 +706,9 @@ acr122s_abort_command(nfc_device *pnd)
#ifndef WIN32
close(DRIVER_DATA(pnd)->abort_fds[0]);
close(DRIVER_DATA(pnd)->abort_fds[1]);
pipe(DRIVER_DATA(pnd)->abort_fds);
if (pipe(DRIVER_DATA(pnd)->abort_fds) < 0 ) {
return NFC_ESOFT;
}
#else
DRIVER_DATA(pnd)->abort_flag = true;
#endif
......
......@@ -265,7 +265,9 @@ arygon_open (const nfc_connstring connstring)
#ifndef WIN32
// pipe-based abort mecanism
pipe (DRIVER_DATA (pnd)->iAbortFds);
if (pipe (DRIVER_DATA (pnd)->iAbortFds) < 0) {
return NULL;
}
#else
DRIVER_DATA (pnd)->abort_flag = false;
#endif
......@@ -545,7 +547,9 @@ arygon_abort_command (nfc_device *pnd)
if (pnd) {
#ifndef WIN32
close (DRIVER_DATA (pnd)->iAbortFds[0]);
pipe (DRIVER_DATA (pnd)->iAbortFds);
if (pipe (DRIVER_DATA (pnd)->iAbortFds) < 0) {
return NFC_ESOFT;
}
#else
DRIVER_DATA (pnd)->abort_flag = true;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment