From f4959072dc36bccaba2cc3b1520d1dace04300ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Ho=CC=88ner?= Date: Mon, 28 Nov 2016 19:12:28 +0100 Subject: [PATCH] Renamed ZydisFormatFlags -> ZydisFormatterFlags --- include/Zydis/Formatter.h | 6 +++--- src/Formatter.c | 2 +- tools/ZydisFuzzIn.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Zydis/Formatter.h b/include/Zydis/Formatter.h index 5173db7..649229f 100644 --- a/include/Zydis/Formatter.h +++ b/include/Zydis/Formatter.h @@ -61,7 +61,7 @@ enum ZydisFormatterStyles /** * @brief Defines the @c ZydisFormatFlags datatype. */ -typedef uint32_t ZydisFormatFlags; +typedef uint32_t ZydisFormatterFlags; /** * @brief Formats the instruction in uppercase instead of lowercase. @@ -378,7 +378,7 @@ typedef ZydisStatus (*ZydisFormatterFormatAddressFunc)(ZydisInstructionFormatter */ struct ZydisInstructionFormatter_ { - ZydisFormatFlags flags; + ZydisFormatterFlags flags; ZydisFormatterAddressFormat addressFormat; ZydisFormatterDisplacementFormat displacementFormat; ZydisFormatterImmediateFormat immediateFormat; @@ -431,7 +431,7 @@ ZYDIS_EXPORT ZydisStatus ZydisFormatterInitInstructionFormatter( * @return A zydis status code. */ ZYDIS_EXPORT ZydisStatus ZydisFormatterInitInstructionFormatterEx( - ZydisInstructionFormatter* formatter, ZydisFormatterStyle style, ZydisFormatFlags flags, + ZydisInstructionFormatter* formatter, ZydisFormatterStyle style, ZydisFormatterFlags flags, ZydisFormatterAddressFormat addressFormat, ZydisFormatterDisplacementFormat displacementFormat, ZydisFormatterImmediateFormat immmediateFormat); diff --git a/src/Formatter.c b/src/Formatter.c index 00b3759..e12ab61 100644 --- a/src/Formatter.c +++ b/src/Formatter.c @@ -816,7 +816,7 @@ ZydisStatus ZydisFormatterInitInstructionFormatter( } ZydisStatus ZydisFormatterInitInstructionFormatterEx( - ZydisInstructionFormatter* formatter, ZydisFormatterStyle style, ZydisFormatFlags flags, + ZydisInstructionFormatter* formatter, ZydisFormatterStyle style, ZydisFormatterFlags flags, ZydisFormatterAddressFormat addressFormat, ZydisFormatterDisplacementFormat displacementFormat, ZydisFormatterImmediateFormat immmediateFormat) { diff --git a/tools/ZydisFuzzIn.c b/tools/ZydisFuzzIn.c index 9e4cbe3..89cc3bb 100644 --- a/tools/ZydisFuzzIn.c +++ b/tools/ZydisFuzzIn.c @@ -43,7 +43,7 @@ typedef struct ZydisFuzzControlBlock_ { ZydisDisassemblerMode disasMode; ZydisDecoderFlags decoderFlags; ZydisFormatterStyle formatterStyle; - ZydisFormatFlags formatterFlags; + ZydisFormatterFlags formatterFlags; ZydisFormatterAddressFormat formatterAddrFormat; ZydisFormatterDisplacementFormat formatterDispFormat; ZydisFormatterImmediateFormat formatterImmFormat;