forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-07-21 03:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused result warnings and add a new NFC_ESOFT error.

Browse Source
This commit is contained in:
Romuald Conty
2012-05-16 18:24:16 +00:00
parent bfcdb1bd4c
commit 45ef3b43c4
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnfc/drivers/acr122s.c
View File

@@ -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

8
libnfc/drivers/arygon.c
View File

@@ -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