From 0e9d48fff092b6e27ec88f9ec60b3f89ccb60585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 4 Apr 2023 12:37:09 +0800 Subject: [PATCH] FFstrbuf: remove FF_STRBUF_CREATE macro --- src/modules/icons.c | 5 ++--- src/modules/theme.c | 9 ++++----- src/util/FFstrbuf.h | 2 -- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/modules/icons.c b/src/modules/icons.c index 81fa3af9d..50a0978fe 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -36,7 +36,8 @@ void ffPrintIcons(FFinstance* instance) return; } - FF_STRBUF_CREATE(gtkPretty); + FF_STRBUF_AUTO_DESTROY gtkPretty; + ffStrbufInit(>kPretty); ffParseGTK(>kPretty, gtk2, gtk3, gtk4); if(instance->config.icons.outputFormat.length == 0) @@ -65,7 +66,5 @@ void ffPrintIcons(FFinstance* instance) }); } - ffStrbufDestroy(>kPretty); - #endif } diff --git a/src/modules/theme.c b/src/modules/theme.c index 04a2e1d7b..9dde574d7 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -36,7 +36,8 @@ void ffPrintTheme(FFinstance* instance) return; } - FF_STRBUF_CREATE(plasmaColorPretty); + FF_STRBUF_AUTO_DESTROY plasmaColorPretty; + ffStrbufInit(&plasmaColorPretty); if(ffStrbufStartsWithIgnCase(&plasma->colorScheme, &plasma->widgetStyle)) ffStrbufAppendNS(&plasmaColorPretty, plasma->colorScheme.length - plasma->widgetStyle.length, &plasma->colorScheme.chars[plasma->widgetStyle.length]); else @@ -44,7 +45,8 @@ void ffPrintTheme(FFinstance* instance) ffStrbufTrim(&plasmaColorPretty, ' '); - FF_STRBUF_CREATE(gtkPretty); + FF_STRBUF_AUTO_DESTROY gtkPretty; + ffStrbufInit(>kPretty); ffParseGTK(>kPretty, gtk2, gtk3, gtk4); if(instance->config.theme.outputFormat.length == 0) @@ -98,8 +100,5 @@ void ffPrintTheme(FFinstance* instance) }); } - ffStrbufDestroy(&plasmaColorPretty); - ffStrbufDestroy(>kPretty); - #endif } diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h index 3d6b12e8f..d7d414dc1 100644 --- a/src/util/FFstrbuf.h +++ b/src/util/FFstrbuf.h @@ -28,8 +28,6 @@ typedef struct FFstrbuf char* chars; } FFstrbuf; -#define FF_STRBUF_CREATE(name) FFstrbuf name; ffStrbufInit(&name); - void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate); void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src); void ffStrbufInitMove(FFstrbuf* strbuf, FFstrbuf* src);