crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r566-569 from the libnfc-error-handling branch.

Browse source 
Fix issue 103
This commit is contained in:
Romain Tartiere 2010-08-24 09:32:42 +00:00
commit fbcf966d20
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,4 +1,6 @@
# General init # General init
# /!\ Don't forget to update 'windows/Makefile' too /!\
AC_INIT(libnfc, 1.3.9, info@libnfc.org) AC_INIT(libnfc, 1.3.9, info@libnfc.org)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

10
examples/nfc-list.c
View file

@ -149,7 +149,7 @@ int main(int argc, const char* argv[])
// List ISO14443A targets // List ISO14443A targets
if (nfc_initiator_list_passive_targets(pnd, NM_ISO14443A_106, anti, MAX_TARGET_COUNT, &szTargetFound )) { if (nfc_initiator_list_passive_targets(pnd, NM_ISO14443A_106, anti, MAX_TARGET_COUNT, &szTargetFound )) {
size_t n; size_t n;
printf("%zu ISO14443A passive target(s) was found%s\n", szTargetFound, (szTargetFound==0)?".\n":":"); printf("%d ISO14443A passive target(s) was found%s\n", (int)szTargetFound, (szTargetFound==0)?".\n":":");
for(n=0; n<szTargetFound; n++) { for(n=0; n<szTargetFound; n++) {
print_nfc_iso14443a_info (anti[n].nai); print_nfc_iso14443a_info (anti[n].nai);
printf("\n"); printf("\n");
@ -159,7 +159,7 @@ int main(int argc, const char* argv[])
// List Felica tags // List Felica tags
if (nfc_initiator_list_passive_targets(pnd, NM_FELICA_212, anti, MAX_TARGET_COUNT, &szTargetFound )) { if (nfc_initiator_list_passive_targets(pnd, NM_FELICA_212, anti, MAX_TARGET_COUNT, &szTargetFound )) {
size_t n; size_t n;
printf("%zu Felica (212 kbps) passive target(s) was found%s\n", szTargetFound, (szTargetFound==0)?".\n":":"); printf("%d Felica (212 kbps) passive target(s) was found%s\n", (int)szTargetFound, (szTargetFound==0)?".\n":":");
for(n=0; n<szTargetFound; n++) { for(n=0; n<szTargetFound; n++) {
print_nfc_felica_info (anti[n].nfi); print_nfc_felica_info (anti[n].nfi);
printf("\n"); printf("\n");
@ -167,7 +167,7 @@ int main(int argc, const char* argv[])
} }
if (nfc_initiator_list_passive_targets(pnd, NM_FELICA_424, anti, MAX_TARGET_COUNT, &szTargetFound )) { if (nfc_initiator_list_passive_targets(pnd, NM_FELICA_424, anti, MAX_TARGET_COUNT, &szTargetFound )) {
size_t n; size_t n;
printf("%zu Felica (424 kbps) passive target(s) was found%s\n", szTargetFound, (szTargetFound==0)?".\n":":"); printf("%d Felica (424 kbps) passive target(s) was found%s\n", (int)szTargetFound, (szTargetFound==0)?".\n":":");
for(n=0; n<szTargetFound; n++) { for(n=0; n<szTargetFound; n++) {
print_nfc_felica_info (anti[n].nfi); print_nfc_felica_info (anti[n].nfi);
printf("\n"); printf("\n");
@ -177,7 +177,7 @@ int main(int argc, const char* argv[])
// List ISO14443B targets // List ISO14443B targets
if (nfc_initiator_list_passive_targets(pnd, NM_ISO14443B_106, anti, MAX_TARGET_COUNT, &szTargetFound )) { if (nfc_initiator_list_passive_targets(pnd, NM_ISO14443B_106, anti, MAX_TARGET_COUNT, &szTargetFound )) {
size_t n; size_t n;
printf("%zu ISO14443B passive target(s) was found%s\n", szTargetFound, (szTargetFound==0)?".\n":":"); printf("%d ISO14443B passive target(s) was found%s\n", (int)szTargetFound, (szTargetFound==0)?".\n":":");
for(n=0; n<szTargetFound; n++) { for(n=0; n<szTargetFound; n++) {
print_nfc_iso14443b_info (anti[n].nbi); print_nfc_iso14443b_info (anti[n].nbi);
printf("\n"); printf("\n");
@ -188,7 +188,7 @@ int main(int argc, const char* argv[])
// List Jewel targets // List Jewel targets
if (nfc_initiator_list_passive_targets(pnd, NM_JEWEL_106, anti, MAX_TARGET_COUNT, &szTargetFound )) { if (nfc_initiator_list_passive_targets(pnd, NM_JEWEL_106, anti, MAX_TARGET_COUNT, &szTargetFound )) {
size_t n; size_t n;
printf("%zu Jewel passive target(s) was found%s\n", szTargetFound, (szTargetFound==0)?".\n":":"); for(n=0; n<szTargetFound; n++) { printf("%d Jewel passive target(s) was found%s\n", (int)szTargetFound, (szTargetFound==0)?".\n":":"); for(n=0; n<szTargetFound; n++) {
printf("Jewel support is missing in libnfc, feel free to contribute.\n"); printf("Jewel support is missing in libnfc, feel free to contribute.\n");
printf("\n"); printf("\n");
} }

2
windows/Makefile
View file

@ -14,7 +14,7 @@ NFCOPTS= /I..\include \
/DDRIVER_ARYGON_ENABLED \ /DDRIVER_ARYGON_ENABLED \
/DDRIVER_PN532_UART_ENABLED /DDRIVER_PN532_UART_ENABLED
NFCLIBOPTS=/Dnfc_EXPORTS /DPACKAGE_VERSION=\"1.3.4\" NFCLIBOPTS=/Dnfc_EXPORTS /DPACKAGE_VERSION=\"1.3.9\"
CFLAGS=$(COMMONOPTS) /WX $(NFCOPTS) CFLAGS=$(COMMONOPTS) /WX $(NFCOPTS)
CXXFLAGS=$(COMMONOPTS) /EHa $(NFCOPTS) CXXFLAGS=$(COMMONOPTS) /EHa $(NFCOPTS)