From 30953a31dcd3e97dca68b89dfb9148523ce651ba Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 8 May 2021 21:13:58 +0200 Subject: [PATCH] small changes to memory managment --- src/common/detectWMDE.c | 5 ++--- src/common/settings.c | 2 +- src/util/FFstrbuf.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/detectWMDE.c b/src/common/detectWMDE.c index 516e39b0f..8e9d9149a 100644 --- a/src/common/detectWMDE.c +++ b/src/common/detectWMDE.c @@ -155,17 +155,16 @@ static void getFromProcDir(FFWMDEResult* result, ProcData* procData, bool search uint32_t procPathLength = procPath.length; FFstrbuf processName; - ffStrbufInit(&processName); + ffStrbufInitA(&processName, 256); //Some processes have large command lines (looking at you chrome) while((procData->dirent = readdir(procData->proc)) != NULL) { - if(procData->dirent->d_type != DT_DIR) + if(procData->dirent->d_type != DT_DIR || procData->dirent->d_name[0] == '.') continue; ffStrbufAppendS(&procPath, procData->dirent->d_name); ffStrbufAppendS(&procPath, "/cmdline"); ffGetFileContent(procPath.chars, &processName); - ffStrbufRecalculateLength(&processName); ffStrbufSubstrAfterLastC(&processName, '/'); ffStrbufSubstrBefore(&procPath, procPathLength); diff --git a/src/common/settings.c b/src/common/settings.c index 780f02734..1e744955d 100644 --- a/src/common/settings.c +++ b/src/common/settings.c @@ -11,7 +11,7 @@ typedef struct GVariantGetters gboolean(*ffg_variant_get_boolean)(GVariant*); } GVariantGetters; -static void initGVariantGetters(void* library, GVariantGetters* variantGetters) +static inline void initGVariantGetters(void* library, GVariantGetters* variantGetters) { variantGetters->ffg_variant_get_string = dlsym(library, "g_variant_get_string"); variantGetters->ffg_variant_get_boolean = dlsym(library, "g_variant_get_boolean"); diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c index 5512957c3..2799b4335 100644 --- a/src/util/FFstrbuf.c +++ b/src/util/FFstrbuf.c @@ -218,7 +218,6 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments) va_list localArguments; va_copy(localArguments, arguments); - ffStrbufEnsureFree(strbuf, 256); uint32_t written = (uint32_t) vsnprintf(strbuf->chars + strbuf->length, strbuf->allocated - strbuf->length, format, localArguments); va_end(localArguments);