Align with libnfc API change: test nfc_init() result

promovicz · Mar 30, 2013 · 061b41e · 061b41e
1 parent 86c194e
commit 061b41e
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 3 deletions.
diff --git a/examples/mifare-classic-format.c b/examples/mifare-classic-format.c
@@ -168,6 +168,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-classic-read-ndef.c b/examples/mifare-classic-read-ndef.c
@@ -117,6 +117,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count= nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-classic-write-ndef.c b/examples/mifare-classic-write-ndef.c
@@ -197,6 +197,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-access.c b/examples/mifare-desfire-access.c
@@ -43,6 +43,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-create-ndef.c b/examples/mifare-desfire-create-ndef.c
@@ -98,6 +98,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-ev1-configure-ats.c b/examples/mifare-desfire-ev1-configure-ats.c
@@ -91,6 +91,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-ev1-configure-default-key.c b/examples/mifare-desfire-ev1-configure-default-key.c
@@ -77,6 +77,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-ev1-configure-random-uid.c b/examples/mifare-desfire-ev1-configure-random-uid.c
@@ -87,6 +87,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-format.c b/examples/mifare-desfire-format.c
@@ -87,6 +87,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-info.c b/examples/mifare-desfire-info.c
@@ -41,6 +41,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-read-ndef.c b/examples/mifare-desfire-read-ndef.c
@@ -126,6 +126,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-desfire-write-ndef.c b/examples/mifare-desfire-write-ndef.c
@@ -155,6 +155,8 @@ main(int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/examples/mifare-ultralight-info.c b/examples/mifare-ultralight-info.c
@@ -38,6 +38,8 @@ main (int argc, char *argv[])
 
  nfc_context *context;
  nfc_init (&context);
+ if (context == NULL)
+ errx(EXIT_FAILURE, "Unable to init libnfc (malloc)");
 
  device_count = nfc_list_devices (context, devices, sizeof (devices) / sizeof (*devices));
  if (device_count <= 0)

diff --git a/test/mifare_classic_fixture.c b/test/mifare_classic_fixture.c
@@ -35,7 +35,8 @@ cut_setup (void)
  nfc_connstring devices[8];
  size_t device_count;
 
- nfc_init(&context);
+ nfc_init (&context);
+ cut_assert_not_null (context, cut_message ("Unable to init libnfc (malloc)"));
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/test/mifare_desfire_ev1_fixture.c b/test/mifare_desfire_ev1_fixture.c
@@ -36,6 +36,7 @@ cut_setup (void)
  size_t device_count;
 
  nfc_init (&context);
+ cut_assert_not_null (context, cut_message ("Unable to init libnfc (malloc)"));
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/test/mifare_desfire_fixture.c b/test/mifare_desfire_fixture.c
@@ -35,7 +35,8 @@ cut_setup (void)
  nfc_connstring devices[8];
  size_t device_count;
 
- nfc_init(&context);
+ nfc_init (&context);
+ cut_assert_not_null (context, cut_message ("Unable to init libnfc (malloc)"));
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)

diff --git a/test/mifare_ultralight_fixture.c b/test/mifare_ultralight_fixture.c
@@ -35,7 +35,8 @@ cut_setup (void)
  nfc_connstring devices[8];
  size_t device_count;
 
- nfc_init(&context);
+ nfc_init (&context);
+ cut_assert_not_null (context, cut_message ("Unable to init libnfc (malloc)"));
 
  device_count = nfc_list_devices (context, devices, 8);
  if (device_count <= 0)