make style

libnfc/drivers/pcsc.c

@@ -138,8 +138,7 @@ int pcsc_transmit(struct nfc_device *pnd, const uint8_t *tx, const size_t tx_len
   DWORD dw_rx_len = *rx_len;
   //in libfreefare, tx_len = 1, and it leads to 0x80100008 error, with PC/SC reader, the input tx_len at least two bytes for the SW value
   //so if found the reader is Feitian reader, we set to 2
-  if (dw_rx_len == 1 && is_pcsc_reader_vendor_feitian(pnd))
+  if (dw_rx_len == 1 && is_pcsc_reader_vendor_feitian(pnd)) {
-  {
     dw_rx_len = 2;
   }
 
@@ -204,8 +203,7 @@ uint8_t pcsc_get_icc_type(const struct nfc_device *pnd)
 bool is_pcsc_reader_vendor(const struct nfc_device *pnd, const char *target_vendor_name)
 {
   bool isTarget = false;
-  if (pnd == NULL || strlen(pnd->name) == 0)
+  if (pnd == NULL || strlen(pnd->name) == 0) {
-  {
     return isTarget;
   }
 
@@ -340,8 +338,7 @@ int pcsc_props_to_target(struct nfc_device *pnd, uint8_t it, const uint8_t *patr
             memcpy(pnt->nti.nai.abtUid, puid, szuid);
             pnt->nti.nai.szUidLen = szuid;
           }
-          if (is_pcsc_reader_vendor_feitian(pnd))
+          if (is_pcsc_reader_vendor_feitian(pnd)) {
-          {
             uint8_t atqa[2];
             pcsc_get_atqa(pnd, atqa, sizeof(atqa));
             //memcpy(pnt->nti.nai.abtAtqa,atqa,2);
@@ -974,27 +971,22 @@ pcsc_get_information_about(nfc_device *pnd, char **pbuf)
 
 error:
 #ifdef __APPLE__
-  if (pscc != NULL)
+  if (pscc != NULL) {
-  {
     SCardReleaseContext(*pscc);
   }
-  if (name != NULL)
+  if (name != NULL) {
-  {
     free(name);
     name = NULL;
   }
-  if (type != NULL)
+  if (type != NULL) {
-  {
     free(type);
     type = NULL;
   }
-  if (version != NULL)
+  if (version != NULL) {
-  {
     free(version);
     version = NULL;
   }
-  if (serial != NULL)
+  if (serial != NULL) {
-  {
     free(serial);
     serial = NULL;
   }

libnfc/drivers/pn71xx.c

@@ -169,77 +169,70 @@ static void BufferPrintBytes(char* buffer, unsigned int buflen, const uint8_t *d
 
 static void PrintTagInfo(nfc_tag_info_t *TagInfo)
 {
-	switch (TagInfo->technology)
+  switch (TagInfo->technology) {
-	{
+    case TARGET_TYPE_UNKNOWN: {
-		case TARGET_TYPE_UNKNOWN:
-		{
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type Unknown'");
-		} break;
+    }
-		case TARGET_TYPE_ISO14443_3A:
+    break;
-		{
+    case TARGET_TYPE_ISO14443_3A: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type 3A'");
-		} break;
+    }
-		case TARGET_TYPE_ISO14443_3B:
+    break;
-		{
+    case TARGET_TYPE_ISO14443_3B: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type 3B'");
-		} break;
+    }
-		case TARGET_TYPE_ISO14443_4:
+    break;
-		{
+    case TARGET_TYPE_ISO14443_4: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type 4A'");
-		} break;
+    }
-		case TARGET_TYPE_FELICA:
+    break;
-		{
+    case TARGET_TYPE_FELICA: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type F'");
-		} break;
+    }
-		case TARGET_TYPE_ISO15693:
+    break;
-		{
+    case TARGET_TYPE_ISO15693: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type V'");
-		} break;
+    }
-		case TARGET_TYPE_NDEF:
+    break;
-		{
+    case TARGET_TYPE_NDEF: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type NDEF'");
-		} break;
+    }
-		case TARGET_TYPE_NDEF_FORMATABLE:
+    break;
-		{
+    case TARGET_TYPE_NDEF_FORMATABLE: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type Formatable'");
-		} break;
+    }
-		case TARGET_TYPE_MIFARE_CLASSIC:
+    break;
-		{
+    case TARGET_TYPE_MIFARE_CLASSIC: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type A - Mifare Classic'");
-		} break;
+    }
-		case TARGET_TYPE_MIFARE_UL:
+    break;
-		{
+    case TARGET_TYPE_MIFARE_UL: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type A - Mifare Ul'");
-		} break;
+    }
-		case TARGET_TYPE_KOVIO_BARCODE:
+    break;
-		{
+    case TARGET_TYPE_KOVIO_BARCODE: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type A - Kovio Barcode'");
-		} break;
+    }
-		case TARGET_TYPE_ISO14443_3A_3B:
+    break;
-		{
+    case TARGET_TYPE_ISO14443_3A_3B: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type A/B'");
-		} break;
+    }
-		default:
+    break;
-		{
+    default: {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "'Type %d (Unknown or not supported)'\n", TagInfo->technology);
-		} break;
+    }
+    break;
   }
   /*32 is max UID len (Kovio tags)*/
-	if((0x00 != TagInfo->uid_length) && (32 >= TagInfo->uid_length))
+  if ((0x00 != TagInfo->uid_length) && (32 >= TagInfo->uid_length)) {
-	{		
     char buffer [100];
     int cx = 0;
 
-		if(4 == TagInfo->uid_length || 7 == TagInfo->uid_length || 10 == TagInfo->uid_length)
+    if (4 == TagInfo->uid_length || 7 == TagInfo->uid_length || 10 == TagInfo->uid_length) {
-		{
       cx += snprintf(buffer + cx, sizeof(buffer) - cx, "NFCID1 :    \t'");
-		}
+    } else if (8 == TagInfo->uid_length) {
-		else if(8 == TagInfo->uid_length)
-		{
       cx += snprintf(buffer + cx, sizeof(buffer) - cx, "NFCID2 :    \t'");
-		}
+    } else {
-		else
-		{
       cx += snprintf(buffer + cx, sizeof(buffer) - cx, "UID :    \t'");
     }
 

libnfc/nfc.c

@@ -206,8 +206,7 @@ nfc_device_validate_modulation(nfc_device *pnd, const nfc_mode mode, const nfc_m
 int
 nfc_register_driver(const struct nfc_driver *ndr)
 {
-  if (!ndr)
+  if (!ndr) {
-  { 
     log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "nfc_register_driver returning NFC_EINVARG");
     return NFC_EINVARG;
   }

utils/nfc-mfclassic.c

@@ -620,7 +620,8 @@ print_usage(const char *pcProgramName)
 }
 
 
-bool is_directwrite(){
+bool is_directwrite()
+{
   printf("Checking if Badge is DirectWrite...\n");
 
   // Set default keys