nfc_init() return rather than exit on malloc error, examples fixed accordingly

examples/doc/quick_start_example1.c

@@ -36,6 +36,10 @@ main(int argc, const char *argv[])
 
   // Initialize libnfc and set the nfc_context
   nfc_init(&context);
+  if (context == NULL) {
+    warnx("Unable to init libnfc (malloc)\n");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   const char *acLibnfcVersion = nfc_version();

examples/doc/quick_start_example2.c

@@ -28,6 +28,10 @@ main(int argc, const char *argv[])
 
   // Initialize libnfc and set the nfc_context
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   const char *acLibnfcVersion = nfc_version();

examples/nfc-anticol.c

@@ -151,12 +151,16 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC reader
   pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    printf("Error opening NFC reader\n");
+    ERR("Error opening NFC reader");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

examples/nfc-dep-initiator.c

@@ -73,10 +73,14 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   pnd = nfc_open(context, NULL);
   if (pnd == NULL) {
-    printf("Unable to open NFC device.\n");
+    ERR("Unable to open NFC device.");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

examples/nfc-dep-target.c

@@ -72,6 +72,10 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 #define MAX_DEVICE_COUNT 2
   nfc_connstring connstrings[MAX_DEVICE_COUNT];
   size_t szDeviceFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);

examples/nfc-emulate-forum-tag2.c

@@ -187,6 +187,10 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
   pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {

examples/nfc-emulate-tag.c

@@ -181,6 +181,10 @@ main(int argc, char *argv[])
 #endif
 
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   acLibnfcVersion = nfc_version();

examples/nfc-emulate-uid.c

@@ -128,12 +128,16 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC device
   pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    printf("Unable to open NFC device\n");
+    ERR("Unable to open NFC device");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

examples/nfc-mfsetuid.c

@@ -179,12 +179,16 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC reader
   pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    printf("Error opening NFC reader\n");
+    ERR("Error opening NFC reader");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

examples/nfc-poll.c

@@ -105,6 +105,10 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   pnd = nfc_open(context, NULL);
 

examples/nfc-relay.c

@@ -110,6 +110,10 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
   nfc_connstring connstrings[MAX_DEVICE_COUNT];
   // List available devices
   size_t szFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
@@ -123,7 +127,7 @@ main(int argc, char *argv[])
   // Try to open the NFC emulator device
   pndTag = nfc_open(context, connstrings[0]);
   if (pndTag == NULL) {
-    printf("Error opening NFC emulator device\n");
+    ERR("Error opening NFC emulator device");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

examples/pn53x-diagnose.c

@@ -69,6 +69,10 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   acLibnfcVersion = nfc_version();

examples/pn53x-sam.c

@@ -77,6 +77,10 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   const char *acLibnfcVersion = nfc_version();

examples/pn53x-tamashell.c

@@ -85,6 +85,10 @@ int main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC reader
   pnd = nfc_open(context, NULL);

libnfc/nfc.c

@@ -174,8 +174,7 @@ nfc_init(nfc_context **context)
   *context = nfc_context_new();
   if (!context) {
     perror("malloc");
-    // TODO: not a good idea to call exit() from a library, we should change API and return error
+    return;
-    exit(EXIT_FAILURE);
   }
   if (!nfc_drivers)
     nfc_drivers_init();

utils/nfc-emulate-forum-tag4.c

@@ -380,6 +380,10 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)\n");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC reader
   pnd = nfc_open(context, NULL);

utils/nfc-list.c

@@ -71,6 +71,10 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   acLibnfcVersion = nfc_version();

utils/nfc-mfclassic.c

@@ -503,11 +503,15 @@ main(int argc, const char *argv[])
 // printf("Successfully opened required files\n");
 
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
 // Try to open the NFC reader
   pnd = nfc_open(context, NULL);
   if (pnd == NULL) {
-    printf("Error opening NFC reader\n");
+    ERR("Error opening NFC reader");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

utils/nfc-mfultralight.c

@@ -206,11 +206,15 @@ main(int argc, const char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   // Try to open the NFC device
   pnd = nfc_open(context, NULL);
   if (pnd == NULL) {
-    ERR("Error opening NFC device\n");
+    ERR("Error opening NFC device");
     nfc_exit(context);
     exit(EXIT_FAILURE);
   }

utils/nfc-read-forum-tag3.c

@@ -198,6 +198,10 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)\n");
+    exit(EXIT_FAILURE);
+  }
 
   pnd = nfc_open(context, NULL);
 

utils/nfc-relay-picc.c

@@ -197,6 +197,10 @@ main(int argc, char *argv[])
 
   nfc_context *context;
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
   nfc_connstring connstrings[MAX_DEVICE_COUNT];
   // List available devices

utils/nfc-scan-device.c

@@ -90,6 +90,10 @@ main(int argc, const char *argv[])
   }
 
   nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)\n");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
   acLibnfcVersion = nfc_version();