[flashrom] [commit] r1495 - trunk

[repository service]

Author: hailfinger
Date: Thu Feb 16 02:43:06 2012
New Revision: 1495
URL: http://flashrom.org/trac/flashrom/changeset/1495

Log:
Workaround missing %hhx support in MinGW sscanf

MinGW uses standard Windows C libraries and those apparently don't
support %hhx for sscanf into a uint8_t. SCNx8 isn't available either.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Idwer Vollering <vidwer at gmail.com>

Modified:
   trunk/dummyflasher.c

Modified: trunk/dummyflasher.c
==============================================================================
--- trunk/dummyflasher.c	Thu Feb 16 02:13:00 2012	(r1494)
+++ trunk/dummyflasher.c	Thu Feb 16 02:43:06 2012	(r1495)
@@ -199,7 +199,12 @@
 			}
 		}
 		for (i = 0; i < spi_blacklist_size; i++) {
-			sscanf(tmp + i * 2, "%2hhx", &spi_blacklist[i]);
+			unsigned int tmp2;
+			/* SCNx8 is apparently not supported by MSVC (and thus
+			 * MinGW), so work around it with an extra variable
+			 */
+			sscanf(tmp + i * 2, "%2x", &tmp2);
+			spi_blacklist[i] = (uint8_t)tmp2;
 		}
 		msg_pdbg("SPI blacklist is ");
 		for (i = 0; i < spi_blacklist_size; i++)
@@ -230,7 +235,12 @@
 			}
 		}
 		for (i = 0; i < spi_ignorelist_size; i++) {
-			sscanf(tmp + i * 2, "%2hhx", &spi_ignorelist[i]);
+			unsigned int tmp2;
+			/* SCNx8 is apparently not supported by MSVC (and thus
+			 * MinGW), so work around it with an extra variable
+			 */
+			sscanf(tmp + i * 2, "%2x", &tmp2);
+			spi_ignorelist[i] = (uint8_t)tmp2;
 		}
 		msg_pdbg("SPI ignorelist is ");
 		for (i = 0; i < spi_ignorelist_size; i++)