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

Remove INFO macro: display was not clear enough and does not provide a big benefit.

Browse source 
New Issue
Summary: Remove nfc-message.h file from installed ones
nfc-message.h provide some usefull debugging macros but I am not sure that these macros have to be installed with other files.
This commit is contained in:
Romuald Conty 2010-10-26 14:27:17 +00:00
parent 1963bb65e4
commit a214974684
7 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/nfc-anticol.c
View file

@ -124,7 +124,6 @@ main (int argc, char *argv[])
print_usage (argv); print_usage (argv);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (0 == strcmp (argv[arg], "-q")) { } else if (0 == strcmp (argv[arg], "-q")) {
INFO ("%s", "Quiet mode.");
quiet_output = true; quiet_output = true;
} else { } else {
ERR ("%s is not supported option.", argv[arg]); ERR ("%s is not supported option.", argv[arg]);

2
examples/nfc-list.c
View file

@ -101,7 +101,7 @@ main (int argc, const char *argv[])
} }
if (szDeviceFound == 0) { if (szDeviceFound == 0) {
INFO ("%s", "No device found."); printf ("No NFC device found.\n");
} }
for (i = 0; i < szDeviceFound; i++) { for (i = 0; i < szDeviceFound; i++) {

2
examples/nfc-poll.c
View file

@ -70,7 +70,7 @@ main (int argc, const char *argv[])
nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound); nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound);
if (szFound == 0) { if (szFound == 0) {
INFO ("%s", "No device found."); printf ("No NFC device found.\n");
} }
for (i = 0; i < szFound; i++) { for (i = 0; i < szFound; i++) {

7
examples/nfc-relay-picc.c
View file

@ -162,14 +162,13 @@ main (int argc, char *argv[])
print_usage (argv); print_usage (argv);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else if (0 == strcmp (argv[arg], "-q")) { } else if (0 == strcmp (argv[arg], "-q")) {
INFO ("%s", "Quiet mode.");
quiet_output = true; quiet_output = true;
} else if (0 == strcmp (argv[arg], "-t")) { } else if (0 == strcmp (argv[arg], "-t")) {
INFO ("%s", "Target mode only."); printf ("INFO: %s\n", "Target mode only.");
initiator_only_mode = false; initiator_only_mode = false;
target_only_mode = true; target_only_mode = true;
} else if (0 == strcmp (argv[arg], "-i")) { } else if (0 == strcmp (argv[arg], "-i")) {
INFO ("%s", "Initiator mode only."); printf ("INFO: %s\n", "Initiator mode only.");
initiator_only_mode = true; initiator_only_mode = true;
target_only_mode = false; target_only_mode = false;
} else if (0 == strcmp (argv[arg], "-n")) { } else if (0 == strcmp (argv[arg], "-n")) {
@ -178,7 +177,7 @@ main (int argc, char *argv[])
print_usage (argv); print_usage (argv);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
INFO ("Waiting time: %i secs.", waiting_time); printf ("Waiting time: %i secs.\n", waiting_time);
} else { } else {
ERR ("%s is not supported option.", argv[arg]); ERR ("%s is not supported option.", argv[arg]);
print_usage (argv); print_usage (argv);

1
examples/nfc-relay.c
View file

@ -82,7 +82,6 @@ main (int argc, char *argv[])
print_usage (argv); print_usage (argv);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else if (0 == strcmp (argv[arg], "-q")) { } else if (0 == strcmp (argv[arg], "-q")) {
INFO ("%s", "Quiet mode.");
quiet_output = true; quiet_output = true;
} else { } else {
ERR ("%s is not supported option.", argv[arg]); ERR ("%s is not supported option.", argv[arg]);

2
examples/pn53x-diagnose.c
View file

@ -65,7 +65,7 @@ main (int argc, const char *argv[])
nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound); nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound);
if (szFound == 0) { if (szFound == 0) {
INFO ("%s", "No device found."); printf ("No NFC device found.\n");
} }
for (i = 0; i < szFound; i++) { for (i = 0; i < szFound; i++) {

7
include/nfc/nfc-messages.h
View file

@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
* *
* @file messages.h * @file nfc-messages.h
* @brief * @brief Printing macros
*/ */
// TODO remove this file from installed headers.
#ifndef _LIBNFC_MESSAGES_H_ #ifndef _LIBNFC_MESSAGES_H_
# define _LIBNFC_MESSAGES_H_ # define _LIBNFC_MESSAGES_H_
@ -39,7 +39,6 @@
# define DBG(...) {} # define DBG(...) {}
# endif # endif
# define INFO(...) warnx ("INFO: " __VA_ARGS__ )
# define WARN(...) warnx ("WARNING: " __VA_ARGS__ ) # define WARN(...) warnx ("WARNING: " __VA_ARGS__ )
# define ERR(...) warnx ("ERROR: " __VA_ARGS__ ) # define ERR(...) warnx ("ERROR: " __VA_ARGS__ )