diff --git a/examples/nfc-anticol.c b/examples/nfc-anticol.c index 8ca3fd4..7d0f779 100644 --- a/examples/nfc-anticol.c +++ b/examples/nfc-anticol.c @@ -124,7 +124,6 @@ main (int argc, char *argv[]) print_usage (argv); exit(EXIT_SUCCESS); } else if (0 == strcmp (argv[arg], "-q")) { - INFO ("%s", "Quiet mode."); quiet_output = true; } else { ERR ("%s is not supported option.", argv[arg]); diff --git a/examples/nfc-list.c b/examples/nfc-list.c index 54d87fd..2770ceb 100644 --- a/examples/nfc-list.c +++ b/examples/nfc-list.c @@ -101,7 +101,7 @@ main (int argc, const char *argv[]) } if (szDeviceFound == 0) { - INFO ("%s", "No device found."); + printf ("No NFC device found.\n"); } for (i = 0; i < szDeviceFound; i++) { diff --git a/examples/nfc-poll.c b/examples/nfc-poll.c index ed4e487..2151571 100644 --- a/examples/nfc-poll.c +++ b/examples/nfc-poll.c @@ -70,7 +70,7 @@ main (int argc, const char *argv[]) nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound); if (szFound == 0) { - INFO ("%s", "No device found."); + printf ("No NFC device found.\n"); } for (i = 0; i < szFound; i++) { diff --git a/examples/nfc-relay-picc.c b/examples/nfc-relay-picc.c index b5d6d7c..89791ad 100644 --- a/examples/nfc-relay-picc.c +++ b/examples/nfc-relay-picc.c @@ -162,14 +162,13 @@ main (int argc, char *argv[]) print_usage (argv); return EXIT_SUCCESS; } else if (0 == strcmp (argv[arg], "-q")) { - INFO ("%s", "Quiet mode."); quiet_output = true; } else if (0 == strcmp (argv[arg], "-t")) { - INFO ("%s", "Target mode only."); + printf ("INFO: %s\n", "Target mode only."); initiator_only_mode = false; target_only_mode = true; } else if (0 == strcmp (argv[arg], "-i")) { - INFO ("%s", "Initiator mode only."); + printf ("INFO: %s\n", "Initiator mode only."); initiator_only_mode = true; target_only_mode = false; } else if (0 == strcmp (argv[arg], "-n")) { @@ -178,7 +177,7 @@ main (int argc, char *argv[]) print_usage (argv); return EXIT_FAILURE; } - INFO ("Waiting time: %i secs.", waiting_time); + printf ("Waiting time: %i secs.\n", waiting_time); } else { ERR ("%s is not supported option.", argv[arg]); print_usage (argv); diff --git a/examples/nfc-relay.c b/examples/nfc-relay.c index cc2d0ea..3b020eb 100644 --- a/examples/nfc-relay.c +++ b/examples/nfc-relay.c @@ -82,7 +82,6 @@ main (int argc, char *argv[]) print_usage (argv); return EXIT_SUCCESS; } else if (0 == strcmp (argv[arg], "-q")) { - INFO ("%s", "Quiet mode."); quiet_output = true; } else { ERR ("%s is not supported option.", argv[arg]); diff --git a/examples/pn53x-diagnose.c b/examples/pn53x-diagnose.c index e929c29..b97d467 100644 --- a/examples/pn53x-diagnose.c +++ b/examples/pn53x-diagnose.c @@ -65,7 +65,7 @@ main (int argc, const char *argv[]) nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound); if (szFound == 0) { - INFO ("%s", "No device found."); + printf ("No NFC device found.\n"); } for (i = 0; i < szFound; i++) { diff --git a/include/nfc/nfc-messages.h b/include/nfc/nfc-messages.h index bd5f5a0..7ef7904 100644 --- a/include/nfc/nfc-messages.h +++ b/include/nfc/nfc-messages.h @@ -17,10 +17,10 @@ * along with this program. If not, see * * - * @file messages.h - * @brief + * @file nfc-messages.h + * @brief Printing macros */ - +// TODO remove this file from installed headers. #ifndef _LIBNFC_MESSAGES_H_ # define _LIBNFC_MESSAGES_H_ @@ -39,7 +39,6 @@ # define DBG(...) {} # endif -# define INFO(...) warnx ("INFO: " __VA_ARGS__ ) # define WARN(...) warnx ("WARNING: " __VA_ARGS__ ) # define ERR(...) warnx ("ERROR: " __VA_ARGS__ )