JsonConfig: make all non-module keys case-sensitive

CarterLi · CarterLi · commit e32987c408fd · 2025-08-05T16:47:48.000+08:00
diff --git a/src/options/display.c b/src/options/display.c
@@ -13,13 +13,11 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
     if (!object) return NULL;
     if (!yyjson_is_obj(object)) return "Property 'display' must be an object";
 
-    yyjson_val *key_, *val;
+    yyjson_val *key, *val;
     size_t idx, max;
-    yyjson_obj_foreach(object, idx, max, key_, val)
+    yyjson_obj_foreach(object, idx, max, key, val)
     {
-        const char* key = yyjson_get_str(key_);
-
-        if (ffStrEqualsIgnCase(key, "stat"))
+        if (unsafe_yyjson_equals_str(key, "stat"))
         {
             if (yyjson_is_bool(val))
             {
@@ -39,21 +37,21 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             else
                 return "display.stat must be a boolean or a positive integer";
         }
-        else if (ffStrEqualsIgnCase(key, "pipe"))
+        else if (unsafe_yyjson_equals_str(key, "pipe"))
             options->pipe = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "showErrors"))
+        else if (unsafe_yyjson_equals_str(key, "showErrors"))
             options->showErrors = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "disableLinewrap"))
+        else if (unsafe_yyjson_equals_str(key, "disableLinewrap"))
             options->disableLinewrap = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "hideCursor"))
+        else if (unsafe_yyjson_equals_str(key, "hideCursor"))
             options->hideCursor = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "separator"))
+        else if (unsafe_yyjson_equals_str(key, "separator"))
             ffStrbufSetJsonVal(&options->keyValueSeparator, val);
-        else if (ffStrEqualsIgnCase(key, "color"))
+        else if (unsafe_yyjson_equals_str(key, "color"))
         {
             if (yyjson_is_str(val))
             {
-                ffOptionParseColor(yyjson_get_str(val), &options->colorKeys);
+                ffOptionParseColor(unsafe_yyjson_get_str(val), &options->colorKeys);
                 ffStrbufSet(&options->colorTitle, &options->colorKeys);
             }
             else if (yyjson_is_obj(val))
@@ -74,9 +72,9 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             else
                 return "display.color must be either a string or an object";
         }
-        else if (ffStrEqualsIgnCase(key, "brightColor"))
+        else if (unsafe_yyjson_equals_str(key, "brightColor"))
             options->brightColor = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "duration"))
+        else if (unsafe_yyjson_equals_str(key, "duration"))
         {
             if (!yyjson_is_obj(val))
                 return "display.duration must be an object";
@@ -98,7 +96,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
                 options->durationSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;
             }
         }
-        else if (ffStrEqualsIgnCase(key, "size"))
+        else if (unsafe_yyjson_equals_str(key, "size"))
         {
             if (!yyjson_is_obj(val))
                 return "display.size must be an object";
@@ -154,7 +152,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
                 options->sizeSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;
             }
         }
-        else if (ffStrEqualsIgnCase(key, "temp"))
+        else if (unsafe_yyjson_equals_str(key, "temp"))
         {
             if (!yyjson_is_obj(val))
                 return "display.temp must be an object";
@@ -211,7 +209,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
                 options->tempSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;
             }
         }
-        else if (ffStrEqualsIgnCase(key, "percent"))
+        else if (unsafe_yyjson_equals_str(key, "percent"))
         {
             if (!yyjson_is_obj(val))
                 return "display.percent must be an object";
@@ -259,7 +257,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             yyjson_val* width = yyjson_obj_get(val, "width");
             if (width) options->percentWidth = (uint8_t) yyjson_get_uint(width);
         }
-        else if (ffStrEqualsIgnCase(key, "bar"))
+        else if (unsafe_yyjson_equals_str(key, "bar"))
         {
             if (yyjson_is_obj(val))
             {
@@ -369,7 +367,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             else
                 return "display.bar must be an object";
         }
-        else if (ffStrEqualsIgnCase(key, "fraction"))
+        else if (unsafe_yyjson_equals_str(key, "fraction"))
         {
             if (yyjson_is_obj(val))
             {
@@ -386,11 +384,9 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             else
                 return "display.fraction must be an object";
         }
-        else if (ffStrEqualsIgnCase(key, "noBuffer"))
+        else if (unsafe_yyjson_equals_str(key, "noBuffer"))
             options->noBuffer = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "keyWidth"))
-            return "display.keyWidth has been renamed to display.key.width";
-        else if (ffStrEqualsIgnCase(key, "key"))
+        else if (unsafe_yyjson_equals_str(key, "key"))
         {
             if (yyjson_is_obj(val))
             {
@@ -420,7 +416,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             else
                 return "display.key must be an object";
         }
-        else if (ffStrEqualsIgnCase(key, "constants"))
+        else if (unsafe_yyjson_equals_str(key, "constants"))
         {
             if (!yyjson_is_arr(val))
                 return "display.constants must be an array";
@@ -429,7 +425,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             yyjson_arr_foreach(val, idx, max, item)
                 ffStrbufInitJsonVal(ffListAdd(&options->constants), item);
         }
-        else if (ffStrEqualsIgnCase(key, "freq"))
+        else if (unsafe_yyjson_equals_str(key, "freq"))
         {
             if (!yyjson_is_obj(val))
                 return "display.freq must be an object";
diff --git a/src/options/general.c b/src/options/general.c
@@ -12,30 +12,28 @@ const char* ffOptionsParseGeneralJsonConfig(FFOptionsGeneral* options, yyjson_va
     if (!object) return NULL;
     if (!yyjson_is_obj(object)) return "Property 'general' must be an object";
 
-    yyjson_val *key_, *val;
+    yyjson_val *key, *val;
     size_t idx, max;
-    yyjson_obj_foreach(object, idx, max, key_, val)
+    yyjson_obj_foreach(object, idx, max, key, val)
     {
-        const char* key = yyjson_get_str(key_);
-
-        if (ffStrEqualsIgnCase(key, "thread"))
+        if (unsafe_yyjson_equals_str(key, "thread"))
             options->multithreading = yyjson_get_bool(val);
-        else if (ffStrEqualsIgnCase(key, "processingTimeout"))
+        else if (unsafe_yyjson_equals_str(key, "processingTimeout"))
             options->processingTimeout = (int32_t) yyjson_get_int(val);
-        else if (ffStrEqualsIgnCase(key, "preRun"))
+        else if (unsafe_yyjson_equals_str(key, "preRun"))
         {
             if (!yyjson_is_str(val))
                 return "general.preRun must be a string";
             if (system(unsafe_yyjson_get_str(val)) < 0)
                 return "Failed to execute preRun command";
         }
-        else if (ffStrEqualsIgnCase(key, "detectVersion"))
+        else if (unsafe_yyjson_equals_str(key, "detectVersion"))
             options->detectVersion = yyjson_get_bool(val);
 
         #if defined(__linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
-        else if (ffStrEqualsIgnCase(key, "playerName"))
+        else if (unsafe_yyjson_equals_str(key, "playerName"))
             ffStrbufSetJsonVal(&options->playerName, val);
-        else if (ffStrEqualsIgnCase(key, "dsForceDrm"))
+        else if (unsafe_yyjson_equals_str(key, "dsForceDrm"))
         {
             if (yyjson_is_str(val))
             {
@@ -127,6 +125,8 @@ void ffOptionsGenerateGeneralJsonConfig(FFOptionsGeneral* options, yyjson_mut_do
 
     yyjson_mut_obj_add_int(doc, obj, "processingTimeout", options->processingTimeout);
 
+    yyjson_mut_obj_add_bool(doc, obj, "detectVersion", options->detectVersion);
+
     #if defined(__linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
 
     yyjson_mut_obj_add_strbuf(doc, obj, "playerName", &options->playerName);
diff --git a/src/options/logo.c b/src/options/logo.c
@@ -269,13 +269,11 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
 
     if (!yyjson_is_obj(object)) return "Property 'logo' must be an object";
 
-    yyjson_val *key_, *val;
+    yyjson_val *key, *val;
     size_t idx, max;
-    yyjson_obj_foreach(object, idx, max, key_, val)
+    yyjson_obj_foreach(object, idx, max, key, val)
     {
-        const char* key = yyjson_get_str(key_);
-
-        if (ffStrEqualsIgnCase(key, "type"))
+        if (unsafe_yyjson_equals_str(key, "type"))
         {
             int value;
             const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
@@ -302,30 +300,29 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
             options->type = (FFLogoType) value;
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "source"))
+        else if (unsafe_yyjson_equals_str(key, "source"))
         {
             ffStrbufSetJsonVal(&options->source, val);
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "color"))
+        else if (unsafe_yyjson_equals_str(key, "color"))
         {
             if (!yyjson_is_obj(val))
                 return "Property 'color' must be an object";
 
-            yyjson_val *key_c, *valc;
+            yyjson_val *keyc, *valc;
             size_t idxc, maxc;
-            yyjson_obj_foreach(val, idxc, maxc, key_c, valc)
+            yyjson_obj_foreach(val, idxc, maxc, keyc, valc)
             {
-                const char* keyc = yyjson_get_str(key_c);
-                uint32_t index = (uint32_t) strtoul(keyc, NULL, 10);
+                uint32_t index = (uint32_t) strtoul(unsafe_yyjson_get_str(keyc), NULL, 10);
                 if (index < 1 || index > FASTFETCH_LOGO_MAX_COLORS)
                     return "Keys of property 'color' must be a number between 1 to 9";
 
                 ffOptionParseColor(yyjson_get_str(valc), &options->colors[index - 1]);
             }
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "width"))
+        else if (unsafe_yyjson_equals_str(key, "width"))
         {
             if (yyjson_is_null(val))
                 options->width = 0;
@@ -338,7 +335,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
             }
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "height"))
+        else if (unsafe_yyjson_equals_str(key, "height"))
         {
             if (yyjson_is_null(val))
                 options->height = 0;
@@ -351,7 +348,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
             }
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "padding"))
+        else if (unsafe_yyjson_equals_str(key, "padding"))
         {
             if (!yyjson_is_obj(val))
                 return "Logo padding must be an object";
@@ -370,24 +367,22 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
             #undef FF_PARSE_PADDING_POSITON
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "printRemaining"))
+        else if (unsafe_yyjson_equals_str(key, "printRemaining"))
         {
             options->printRemaining = yyjson_get_bool(val);
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "preserveAspectRatio"))
+        else if (unsafe_yyjson_equals_str(key, "preserveAspectRatio"))
         {
             options->preserveAspectRatio = yyjson_get_bool(val);
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "recache"))
+        else if (unsafe_yyjson_equals_str(key, "recache"))
         {
             options->recache = yyjson_get_bool(val);
             continue;
         }
-        else if(ffStrEqualsIgnCase(key, "separate"))
-            return "logo.separate has been renamed to logo.position\n";
-        else if (ffStrEqualsIgnCase(key, "position"))
+        else if (unsafe_yyjson_equals_str(key, "position"))
         {
             int value;
             const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
@@ -401,7 +396,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
             options->position = (FFLogoPosition) value;
             continue;
         }
-        else if (ffStrEqualsIgnCase(key, "chafa"))
+        else if (unsafe_yyjson_equals_str(key, "chafa"))
         {
             if (!yyjson_is_obj(val))
                 return "Chafa config must be an object";

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,11 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`13`	`13`	`if (!object) return NULL;`
`14`	`14`	`if (!yyjson_is_obj(object)) return "Property 'display' must be an object";`
`15`	`15`
`16`		`- yyjson_val key_, val;`
	`16`	`+ yyjson_val key, val;`
`17`	`17`	`size_t idx, max;`
`18`		`- yyjson_obj_foreach(object, idx, max, key_, val)`
	`18`	`+ yyjson_obj_foreach(object, idx, max, key, val)`
`19`	`19`	`{`
`20`		`- const char* key = yyjson_get_str(key_);`
`21`		`-`
`22`		`- if (ffStrEqualsIgnCase(key, "stat"))`
	`20`	`+ if (unsafe_yyjson_equals_str(key, "stat"))`
`23`	`21`	`{`
`24`	`22`	`if (yyjson_is_bool(val))`
`25`	`23`	`{`
`@@ -39,21 +37,21 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`39`	`37`	`else`
`40`	`38`	`return "display.stat must be a boolean or a positive integer";`
`41`	`39`	`}`
`42`		`- else if (ffStrEqualsIgnCase(key, "pipe"))`
	`40`	`+ else if (unsafe_yyjson_equals_str(key, "pipe"))`
`43`	`41`	`options->pipe = yyjson_get_bool(val);`
`44`		`- else if (ffStrEqualsIgnCase(key, "showErrors"))`
	`42`	`+ else if (unsafe_yyjson_equals_str(key, "showErrors"))`
`45`	`43`	`options->showErrors = yyjson_get_bool(val);`
`46`		`- else if (ffStrEqualsIgnCase(key, "disableLinewrap"))`
	`44`	`+ else if (unsafe_yyjson_equals_str(key, "disableLinewrap"))`
`47`	`45`	`options->disableLinewrap = yyjson_get_bool(val);`
`48`		`- else if (ffStrEqualsIgnCase(key, "hideCursor"))`
	`46`	`+ else if (unsafe_yyjson_equals_str(key, "hideCursor"))`
`49`	`47`	`options->hideCursor = yyjson_get_bool(val);`
`50`		`- else if (ffStrEqualsIgnCase(key, "separator"))`
	`48`	`+ else if (unsafe_yyjson_equals_str(key, "separator"))`
`51`	`49`	`ffStrbufSetJsonVal(&options->keyValueSeparator, val);`
`52`		`- else if (ffStrEqualsIgnCase(key, "color"))`
	`50`	`+ else if (unsafe_yyjson_equals_str(key, "color"))`
`53`	`51`	`{`
`54`	`52`	`if (yyjson_is_str(val))`
`55`	`53`	`{`
`56`		`- ffOptionParseColor(yyjson_get_str(val), &options->colorKeys);`
	`54`	`+ ffOptionParseColor(unsafe_yyjson_get_str(val), &options->colorKeys);`
`57`	`55`	`ffStrbufSet(&options->colorTitle, &options->colorKeys);`
`58`	`56`	`}`
`59`	`57`	`else if (yyjson_is_obj(val))`
`@@ -74,9 +72,9 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`74`	`72`	`else`
`75`	`73`	`return "display.color must be either a string or an object";`
`76`	`74`	`}`
`77`		`- else if (ffStrEqualsIgnCase(key, "brightColor"))`
	`75`	`+ else if (unsafe_yyjson_equals_str(key, "brightColor"))`
`78`	`76`	`options->brightColor = yyjson_get_bool(val);`
`79`		`- else if (ffStrEqualsIgnCase(key, "duration"))`
	`77`	`+ else if (unsafe_yyjson_equals_str(key, "duration"))`
`80`	`78`	`{`
`81`	`79`	`if (!yyjson_is_obj(val))`
`82`	`80`	`return "display.duration must be an object";`
`@@ -98,7 +96,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`98`	`96`	`options->durationSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;`
`99`	`97`	`}`
`100`	`98`	`}`
`101`		`- else if (ffStrEqualsIgnCase(key, "size"))`
	`99`	`+ else if (unsafe_yyjson_equals_str(key, "size"))`
`102`	`100`	`{`
`103`	`101`	`if (!yyjson_is_obj(val))`
`104`	`102`	`return "display.size must be an object";`
`@@ -154,7 +152,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`154`	`152`	`options->sizeSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;`
`155`	`153`	`}`
`156`	`154`	`}`
`157`		`- else if (ffStrEqualsIgnCase(key, "temp"))`
	`155`	`+ else if (unsafe_yyjson_equals_str(key, "temp"))`
`158`	`156`	`{`
`159`	`157`	`if (!yyjson_is_obj(val))`
`160`	`158`	`return "display.temp must be an object";`
`@@ -211,7 +209,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`211`	`209`	`options->tempSpaceBeforeUnit = (FFSpaceBeforeUnitType) value;`
`212`	`210`	`}`
`213`	`211`	`}`
`214`		`- else if (ffStrEqualsIgnCase(key, "percent"))`
	`212`	`+ else if (unsafe_yyjson_equals_str(key, "percent"))`
`215`	`213`	`{`
`216`	`214`	`if (!yyjson_is_obj(val))`
`217`	`215`	`return "display.percent must be an object";`
`@@ -259,7 +257,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`259`	`257`	`yyjson_val* width = yyjson_obj_get(val, "width");`
`260`	`258`	`if (width) options->percentWidth = (uint8_t) yyjson_get_uint(width);`
`261`	`259`	`}`
`262`		`- else if (ffStrEqualsIgnCase(key, "bar"))`
	`260`	`+ else if (unsafe_yyjson_equals_str(key, "bar"))`
`263`	`261`	`{`
`264`	`262`	`if (yyjson_is_obj(val))`
`265`	`263`	`{`
`@@ -369,7 +367,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`369`	`367`	`else`
`370`	`368`	`return "display.bar must be an object";`
`371`	`369`	`}`
`372`		`- else if (ffStrEqualsIgnCase(key, "fraction"))`
	`370`	`+ else if (unsafe_yyjson_equals_str(key, "fraction"))`
`373`	`371`	`{`
`374`	`372`	`if (yyjson_is_obj(val))`
`375`	`373`	`{`
`@@ -386,11 +384,9 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`386`	`384`	`else`
`387`	`385`	`return "display.fraction must be an object";`
`388`	`386`	`}`
`389`		`- else if (ffStrEqualsIgnCase(key, "noBuffer"))`
	`387`	`+ else if (unsafe_yyjson_equals_str(key, "noBuffer"))`
`390`	`388`	`options->noBuffer = yyjson_get_bool(val);`
`391`		`- else if (ffStrEqualsIgnCase(key, "keyWidth"))`
`392`		`- return "display.keyWidth has been renamed to display.key.width";`
`393`		`- else if (ffStrEqualsIgnCase(key, "key"))`
	`389`	`+ else if (unsafe_yyjson_equals_str(key, "key"))`
`394`	`390`	`{`
`395`	`391`	`if (yyjson_is_obj(val))`
`396`	`392`	`{`
`@@ -420,7 +416,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`420`	`416`	`else`
`421`	`417`	`return "display.key must be an object";`
`422`	`418`	`}`
`423`		`- else if (ffStrEqualsIgnCase(key, "constants"))`
	`419`	`+ else if (unsafe_yyjson_equals_str(key, "constants"))`
`424`	`420`	`{`
`425`	`421`	`if (!yyjson_is_arr(val))`
`426`	`422`	`return "display.constants must be an array";`
`@@ -429,7 +425,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va`
`429`	`425`	`yyjson_arr_foreach(val, idx, max, item)`
`430`	`426`	`ffStrbufInitJsonVal(ffListAdd(&options->constants), item);`
`431`	`427`	`}`
`432`		`- else if (ffStrEqualsIgnCase(key, "freq"))`
	`428`	`+ else if (unsafe_yyjson_equals_str(key, "freq"))`
`433`	`429`	`{`
`434`	`430`	`if (!yyjson_is_obj(val))`
`435`	`431`	`return "display.freq must be an object";`
Original file line number	Diff line number	Diff line change
`@@ -269,13 +269,11 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`269`	`269`
`270`	`270`	`if (!yyjson_is_obj(object)) return "Property 'logo' must be an object";`
`271`	`271`
`272`		`- yyjson_val key_, val;`
	`272`	`+ yyjson_val key, val;`
`273`	`273`	`size_t idx, max;`
`274`		`- yyjson_obj_foreach(object, idx, max, key_, val)`
	`274`	`+ yyjson_obj_foreach(object, idx, max, key, val)`
`275`	`275`	`{`
`276`		`- const char* key = yyjson_get_str(key_);`
`277`		`-`
`278`		`- if (ffStrEqualsIgnCase(key, "type"))`
	`276`	`+ if (unsafe_yyjson_equals_str(key, "type"))`
`279`	`277`	`{`
`280`	`278`	`int value;`
`281`	`279`	`const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {`
`@@ -302,30 +300,29 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`302`	`300`	`options->type = (FFLogoType) value;`
`303`	`301`	`continue;`
`304`	`302`	`}`
`305`		`- else if (ffStrEqualsIgnCase(key, "source"))`
	`303`	`+ else if (unsafe_yyjson_equals_str(key, "source"))`
`306`	`304`	`{`
`307`	`305`	`ffStrbufSetJsonVal(&options->source, val);`
`308`	`306`	`continue;`
`309`	`307`	`}`
`310`		`- else if (ffStrEqualsIgnCase(key, "color"))`
	`308`	`+ else if (unsafe_yyjson_equals_str(key, "color"))`
`311`	`309`	`{`
`312`	`310`	`if (!yyjson_is_obj(val))`
`313`	`311`	`return "Property 'color' must be an object";`
`314`	`312`
`315`		`- yyjson_val key_c, valc;`
	`313`	`+ yyjson_val keyc, valc;`
`316`	`314`	`size_t idxc, maxc;`
`317`		`- yyjson_obj_foreach(val, idxc, maxc, key_c, valc)`
	`315`	`+ yyjson_obj_foreach(val, idxc, maxc, keyc, valc)`
`318`	`316`	`{`
`319`		`- const char* keyc = yyjson_get_str(key_c);`
`320`		`- uint32_t index = (uint32_t) strtoul(keyc, NULL, 10);`
	`317`	`+ uint32_t index = (uint32_t) strtoul(unsafe_yyjson_get_str(keyc), NULL, 10);`
`321`	`318`	`if (index < 1 \|\| index > FASTFETCH_LOGO_MAX_COLORS)`
`322`	`319`	`return "Keys of property 'color' must be a number between 1 to 9";`
`323`	`320`
`324`	`321`	`ffOptionParseColor(yyjson_get_str(valc), &options->colors[index - 1]);`
`325`	`322`	`}`
`326`	`323`	`continue;`
`327`	`324`	`}`
`328`		`- else if (ffStrEqualsIgnCase(key, "width"))`
	`325`	`+ else if (unsafe_yyjson_equals_str(key, "width"))`
`329`	`326`	`{`
`330`	`327`	`if (yyjson_is_null(val))`
`331`	`328`	`options->width = 0;`
`@@ -338,7 +335,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`338`	`335`	`}`
`339`	`336`	`continue;`
`340`	`337`	`}`
`341`		`- else if (ffStrEqualsIgnCase(key, "height"))`
	`338`	`+ else if (unsafe_yyjson_equals_str(key, "height"))`
`342`	`339`	`{`
`343`	`340`	`if (yyjson_is_null(val))`
`344`	`341`	`options->height = 0;`
`@@ -351,7 +348,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`351`	`348`	`}`
`352`	`349`	`continue;`
`353`	`350`	`}`
`354`		`- else if (ffStrEqualsIgnCase(key, "padding"))`
	`351`	`+ else if (unsafe_yyjson_equals_str(key, "padding"))`
`355`	`352`	`{`
`356`	`353`	`if (!yyjson_is_obj(val))`
`357`	`354`	`return "Logo padding must be an object";`
`@@ -370,24 +367,22 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`370`	`367`	`#undef FF_PARSE_PADDING_POSITON`
`371`	`368`	`continue;`
`372`	`369`	`}`
`373`		`- else if (ffStrEqualsIgnCase(key, "printRemaining"))`
	`370`	`+ else if (unsafe_yyjson_equals_str(key, "printRemaining"))`
`374`	`371`	`{`
`375`	`372`	`options->printRemaining = yyjson_get_bool(val);`
`376`	`373`	`continue;`
`377`	`374`	`}`
`378`		`- else if (ffStrEqualsIgnCase(key, "preserveAspectRatio"))`
	`375`	`+ else if (unsafe_yyjson_equals_str(key, "preserveAspectRatio"))`
`379`	`376`	`{`
`380`	`377`	`options->preserveAspectRatio = yyjson_get_bool(val);`
`381`	`378`	`continue;`
`382`	`379`	`}`
`383`		`- else if (ffStrEqualsIgnCase(key, "recache"))`
	`380`	`+ else if (unsafe_yyjson_equals_str(key, "recache"))`
`384`	`381`	`{`
`385`	`382`	`options->recache = yyjson_get_bool(val);`
`386`	`383`	`continue;`
`387`	`384`	`}`
`388`		`- else if(ffStrEqualsIgnCase(key, "separate"))`
`389`		`- return "logo.separate has been renamed to logo.position\n";`
`390`		`- else if (ffStrEqualsIgnCase(key, "position"))`
	`385`	`+ else if (unsafe_yyjson_equals_str(key, "position"))`
`391`	`386`	`{`
`392`	`387`	`int value;`
`393`	`388`	`const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {`
`@@ -401,7 +396,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo`
`401`	`396`	`options->position = (FFLogoPosition) value;`
`402`	`397`	`continue;`
`403`	`398`	`}`
`404`		`- else if (ffStrEqualsIgnCase(key, "chafa"))`
	`399`	`+ else if (unsafe_yyjson_equals_str(key, "chafa"))`
`405`	`400`	`{`
`406`	`401`	`if (!yyjson_is_obj(val))`
`407`	`402`	`return "Chafa config must be an object";`