remove nfc-message.h usage from examples.

examples/doc/quick_start_example1.c

@@ -4,7 +4,8 @@
 
 #include <stdlib.h>
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
+
+#include "nfc-utils.h"
 
 int
 main (int argc, const char *argv[])

examples/nfc-anticol.c

@@ -45,7 +45,6 @@
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #define SAK_FLAG_ATS_SUPPORTED 0x20

examples/nfc-emulate-forum-tag4.c

@@ -62,7 +62,6 @@
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #define MAX_FRAME_LEN 264

examples/nfc-emulate-tag.c

@@ -49,7 +49,6 @@
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #define MAX_FRAME_LEN (264)

examples/nfc-emulate-uid.c

@@ -52,7 +52,6 @@
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #define MAX_FRAME_LEN 264

examples/nfc-list.c

@@ -51,7 +51,7 @@
 #include <string.h>
 
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
+
 #include "nfc-utils.h"
 
 #define MAX_DEVICE_COUNT 16

examples/nfc-mfultralight.c

@@ -47,7 +47,6 @@
 #include <ctype.h>
 
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
 
 #include "mifare.h"
 

examples/nfc-poll.c

@@ -46,7 +46,7 @@
 
 #include <nfc/nfc.h>
 #include <nfc/nfc-types.h>
-#include <nfc/nfc-messages.h>
+
 #include "nfc-utils.h"
 
 #define MAX_DEVICE_COUNT 16

examples/nfc-relay-picc.c

@@ -47,11 +47,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <signal.h>
-//#include <stddef.h>
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #ifndef _WIN32

examples/nfc-relay.c

@@ -45,7 +45,6 @@
 
 #include <nfc/nfc.h>
 
-#include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
 
 #define MAX_FRAME_LEN 264

examples/nfc-utils.h

@@ -39,6 +39,44 @@
 #  include <stdlib.h>
 #  include <string.h>
 
+/**
+ * @macro DBG
+ * @brief Print a message of standard output only in DEBUG mode
+ */
+#ifdef DEBUG
+//   #define DBG(x, args...) printf("DBG %s:%d: " x "\n", __FILE__, __LINE__,## args )
+#  define DBG(...) do { \
+    warnx ("DBG %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define DBG(...) {}
+#endif
+
+/**
+ * @macro WARN
+ * @brief Print a warn message
+ */
+#  define WARN(...) do { \
+    warnx ("WARNING %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define WARN(...) warnx ("WARNING: " __VA_ARGS__ )
+#endif
+
+/**
+ * @macro ERR
+ * @brief Print a error message
+ */
+#  define ERR(...) do { \
+    warnx ("ERROR %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define ERR(...)  warnx ("ERROR: " __VA_ARGS__ )
+#endif
+
 byte_t  oddparity (const byte_t bt);
 void    oddparity_byte_ts (const byte_t * pbtData, const size_t szLen, byte_t * pbtPar);
 

examples/pn53x-diagnose.c

@@ -36,7 +36,6 @@
 #include <string.h>
 
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
 
 #include "nfc-utils.h"
 #include "chips/pn53x.h"

examples/pn53x-sam.c

@@ -54,9 +54,8 @@
 #endif
 
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
-#include "nfc-utils.h"
 
+#include "nfc-utils.h"
 #include "chips/pn53x.h"
 
 #define MAX_FRAME_LEN 264

examples/pn53x-tamashell.c

@@ -50,7 +50,6 @@
 #include <unistd.h>
 
 #include <nfc/nfc.h>
-#include <nfc/nfc-messages.h>
 
 #include "nfc-utils.h"