FFstrbuf: remove FF_STRBUF_CREATE macro

This commit is contained in:
李通洲
2023-04-04 12:37:09 +08:00
parent e690d73434
commit 0e9d48fff0
3 changed files with 6 additions and 10 deletions
+2 -3
View File
@@ -36,7 +36,8 @@ void ffPrintIcons(FFinstance* instance)
return;
}
FF_STRBUF_CREATE(gtkPretty);
FF_STRBUF_AUTO_DESTROY gtkPretty;
ffStrbufInit(&gtkPretty);
ffParseGTK(&gtkPretty, gtk2, gtk3, gtk4);
if(instance->config.icons.outputFormat.length == 0)
@@ -65,7 +66,5 @@ void ffPrintIcons(FFinstance* instance)
});
}
ffStrbufDestroy(&gtkPretty);
#endif
}
+4 -5
View File
@@ -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(&gtkPretty);
ffParseGTK(&gtkPretty, gtk2, gtk3, gtk4);
if(instance->config.theme.outputFormat.length == 0)
@@ -98,8 +100,5 @@ void ffPrintTheme(FFinstance* instance)
});
}
ffStrbufDestroy(&plasmaColorPretty);
ffStrbufDestroy(&gtkPretty);
#endif
}
-2
View File
@@ -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);