From 06fa8e74781be4b3b820501e5ff3d9726984add5 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 1 Jan 2022 17:28:41 +0100 Subject: [PATCH] Use ffStrbufEndsWithC instead of custom impl --- src/common/init.c | 2 +- src/util/FFstrbuf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/init.c b/src/common/init.c index eb286950e..cd4c8609a 100644 --- a/src/common/init.c +++ b/src/common/init.c @@ -80,7 +80,7 @@ static void initCacheDir(FFstate* state) ffStrbufAppendS(&state->cacheDir, state->passwd->pw_dir); ffStrbufAppendS(&state->cacheDir, "/.cache/"); } - else if(state->cacheDir.chars[state->cacheDir.length - 1] != '/') + else if(!ffStrbufEndsWithC(&state->cacheDir, '/')) ffStrbufAppendC(&state->cacheDir, '/'); mkdir(state->cacheDir.chars, S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); //I hope everybody has a cache folder, but who knows diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c index e04aef74c..966a57a73 100644 --- a/src/util/FFstrbuf.c +++ b/src/util/FFstrbuf.c @@ -363,7 +363,7 @@ void ffStrbufTrimLeft(FFstrbuf* strbuf, char c) void ffStrbufTrimRight(FFstrbuf* strbuf, char c) { - while(strbuf->length > 0 && strbuf->chars[strbuf->length - 1] == c) + while(ffStrbufEndsWithC(strbuf, c)) --strbuf->length; strbuf->chars[strbuf->length] = '\0'; }