forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-04-11 09:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pn532_spi

Browse Source
This commit is contained in:
Philippe Teuwen
2013-03-03 16:10:11 +01:00
parent d9fd9155ea 9a20430bfc
commit 2ac7963076
25 changed files with 386 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnfc/nfc.c
View File

@@ -121,7 +121,7 @@ struct nfc_driver_list {
const struct nfc_driver_list *nfc_drivers = NULL;
static void
nfc_drivers_init()
nfc_drivers_init(void)
{
#if defined (DRIVER_PN53X_USB_ENABLED)
nfc_register_driver(&pn53x_usb_driver);
@@ -1294,6 +1294,8 @@ int
str_nfc_target(char **buf, const nfc_target nt, bool verbose)
{
*buf = malloc(4096);
if (! *buf)
return NFC_ESOFT;
(*buf)[0] = '\0';
sprint_nfc_target(*buf, nt, verbose);
return strlen(*buf);