From dba93afe06fdd55fd9d91dba53ddd2cc7a73fd6f Mon Sep 17 00:00:00 2001
From: Nik <werwolv98@gmail.com>
Date: Wed, 21 Sep 2022 16:34:23 +0200
Subject: [PATCH] patterns: Fixed duplicate variable names

---
 patterns/ntag.hexpat |  8 ++++----
 patterns/pe.hexpat   | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/patterns/ntag.hexpat b/patterns/ntag.hexpat
index bcfa98e..fef84ec 100644
--- a/patterns/ntag.hexpat
+++ b/patterns/ntag.hexpat
@@ -120,21 +120,21 @@ struct ManufacturerData {
 
 struct DynamicLockBytes {
 	u8 bytes[3];
-	u8 RFUI;
+	padding[1];
 };
 
 bitfield MIRROR {
 	MIRROR_CONF	: 2;
 	MIRROR_BYTE	: 2;
-	RFUI		: 1;
+	padding     : 1;
 	STRG_MOD_EN	: 1;
-	RFUI		: 2;
+	padding     : 2;
 } [[left_to_right]];
 
 bitfield ACCESS {
 	PROT				: 1;
 	CFGLCK				: 1;
-	RFUI				: 1;
+	padding             : 1;
 	NFC_CNT_EN			: 1;
 	NFC_CNT_PWD_PROT	: 1;
 	AUTHLIM				: 3;
diff --git a/patterns/pe.hexpat b/patterns/pe.hexpat
index c247ba9..47647ad 100644
--- a/patterns/pe.hexpat
+++ b/patterns/pe.hexpat
@@ -70,7 +70,7 @@ bitfield Characteristics {
 	localSymbolsStripped : 1;
 	aggressiveWsTrim : 1;
 	largeAddressAware : 1;
-	reserved : 1;
+	padding : 1;
 	bytesReversedLo : 1;
 	is32BitMachine : 1;
 	debugInfoStripped : 1;
@@ -83,7 +83,7 @@ bitfield Characteristics {
 } [[right_to_left]];
 
 bitfield DLLCharacteristics {
-	reserved : 4;
+	padding : 4;
 	padding : 1;
 	highEntropyVA : 1;
 	dynamicBase : 1;
@@ -99,15 +99,15 @@ bitfield DLLCharacteristics {
 } [[right_to_left]];
 
 bitfield SectionFlags {
-	reserved : 3;
+	padding : 3;
 	doNotPad : 1;
-	reserved : 1;
+	padding : 1;
 	containsCode : 1;
 	containsInitializedData : 1;
 	containsUninitializedData : 1;
 	linkOther : 1;
 	comments : 1;
-	reserved : 1;
+	padding : 1;
 	remove : 1;
 	comdat : 1;
 	padding : 2;
@@ -209,10 +209,10 @@ struct DOSHeader {
 	u16 initialCSValue;
 	u16 relocationsTablePointer;
 	u16 overlayNumber;
-	u16 reservedWords[4];
+	padding[4 * 2];
 	u16 oemIdentifier;
 	u16 oemInformation;
-	u16 reservedWords[10];
+	padding[10 * 2];
 	u32 coffHeaderPointer;
 };