Formatter: drop PADDING_AUTO preset resolution for disp/imm padding

dxbjavid · dxbjavid · commit 952d40598c26 · 2026-06-04T23:24:40.000+05:30
diff --git a/src/Formatter.c b/src/Formatter.c
@@ -239,15 +239,7 @@ ZyanStatus ZydisFormatterSetProperty(ZydisFormatter* formatter, ZydisFormatterPr
     }
     case ZYDIS_FORMATTER_PROP_DISP_PADDING:
     {
-        if ((ZydisPadding)value == ZYDIS_PADDING_AUTO)
-        {
-            if ((ZyanUSize)formatter->style > ZYDIS_FORMATTER_STYLE_MAX_VALUE)
-            {
-                return ZYAN_STATUS_INVALID_ARGUMENT;
-            }
-            formatter->disp_padding = FORMATTER_PRESETS[formatter->style]->disp_padding;
-        }
-        else if (value > 0xFF)
+        if (value > 0xFF)
         {
             return ZYAN_STATUS_INVALID_ARGUMENT;
         }
@@ -274,15 +266,8 @@ ZyanStatus ZydisFormatterSetProperty(ZydisFormatter* formatter, ZydisFormatterPr
     }
     case ZYDIS_FORMATTER_PROP_IMM_PADDING:
     {
-        if ((ZydisPadding)value == ZYDIS_PADDING_AUTO)
-        {
-            if ((ZyanUSize)formatter->style > ZYDIS_FORMATTER_STYLE_MAX_VALUE)
-            {
-                return ZYAN_STATUS_INVALID_ARGUMENT;
-            }
-            formatter->imm_padding = FORMATTER_PRESETS[formatter->style]->imm_padding;
-        }
-        else if (value > 0xFF)
+        if (((ZydisPadding)value != ZYDIS_PADDING_AUTO) &&
+            (value > 0xFF))
         {
             return ZYAN_STATUS_INVALID_ARGUMENT;
         }

Original file line number	Diff line number	Diff line change
`@@ -239,15 +239,7 @@ ZyanStatus ZydisFormatterSetProperty(ZydisFormatter* formatter, ZydisFormatterPr`
`239`	`239`	`}`
`240`	`240`	`case ZYDIS_FORMATTER_PROP_DISP_PADDING:`
`241`	`241`	`{`
`242`		`- if ((ZydisPadding)value == ZYDIS_PADDING_AUTO)`
`243`		`- {`
`244`		`- if ((ZyanUSize)formatter->style > ZYDIS_FORMATTER_STYLE_MAX_VALUE)`
`245`		`- {`
`246`		`- return ZYAN_STATUS_INVALID_ARGUMENT;`
`247`		`- }`
`248`		`- formatter->disp_padding = FORMATTER_PRESETS[formatter->style]->disp_padding;`
`249`		`- }`
`250`		`- else if (value > 0xFF)`
	`242`	`+ if (value > 0xFF)`
`251`	`243`	`{`
`252`	`244`	`return ZYAN_STATUS_INVALID_ARGUMENT;`
`253`	`245`	`}`
`@@ -274,15 +266,8 @@ ZyanStatus ZydisFormatterSetProperty(ZydisFormatter* formatter, ZydisFormatterPr`
`274`	`266`	`}`
`275`	`267`	`case ZYDIS_FORMATTER_PROP_IMM_PADDING:`
`276`	`268`	`{`
`277`		`- if ((ZydisPadding)value == ZYDIS_PADDING_AUTO)`
`278`		`- {`
`279`		`- if ((ZyanUSize)formatter->style > ZYDIS_FORMATTER_STYLE_MAX_VALUE)`
`280`		`- {`
`281`		`- return ZYAN_STATUS_INVALID_ARGUMENT;`
`282`		`- }`
`283`		`- formatter->imm_padding = FORMATTER_PRESETS[formatter->style]->imm_padding;`
`284`		`- }`
`285`		`- else if (value > 0xFF)`
	`269`	`+ if (((ZydisPadding)value != ZYDIS_PADDING_AUTO) &&`
	`270`	`+ (value > 0xFF))`
`286`	`271`	`{`
`287`	`272`	`return ZYAN_STATUS_INVALID_ARGUMENT;`
`288`	`273`	`}`