fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-08 06:00:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Public IP module

Browse Source
This commit is contained in:
Linus Dierheimer
2022-01-10 20:20:18 +01:00
parent d6a80d7c85
commit 816d86aee8
13 changed files with 185 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/FFstrbuf.c
+25 -18
View File
@@ -6,16 +6,6 @@
static char* CHAR_NULL_PTR = "";
static bool strbufCharsLeft(uint32_t i, const void* strbuf)
{
return i < ((const FFstrbuf*) strbuf)->length;
}
static bool strbufCharsLeftS(uint32_t i, const void* str)
{
return ((const char*) str)[i] != '\0';
}
void ffStrbufInit(FFstrbuf* strbuf)
{
ffStrbufInitA(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC);
@@ -37,7 +27,7 @@ void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* value)
ffStrbufInitANS(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC, length, value);
}
void ffStrbufInitC(FFstrbuf* strbuf, const char c)
void ffStrbufInitC(FFstrbuf* strbuf, char c)
{
ffStrbufInitAC(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC, c);
}
@@ -65,7 +55,7 @@ void ffStrbufInitANS(FFstrbuf* strbuf, uint32_t allocate, uint32_t length, const
ffStrbufAppendNS(strbuf, length, value);
}
void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, const char c)
void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, char c)
{
ffStrbufInitA(strbuf, allocate);
ffStrbufAppendC(strbuf, c);
@@ -164,7 +154,7 @@ void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value)
ffStrbufAppendNS(strbuf, length, value);
}
void ffStrbufSetC(FFstrbuf* strbuf, const char c)
void ffStrbufSetC(FFstrbuf* strbuf, char c)
{
ffStrbufClear(strbuf);
ffStrbufAppendC(strbuf, c);
@@ -272,7 +262,7 @@ void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* va
strbuf->chars[strbuf->length] = '\0';
}
void ffStrbufAppendC(FFstrbuf* strbuf, const char c)
void ffStrbufAppendC(FFstrbuf* strbuf, char c)
{
ffStrbufEnsureFree(strbuf, 1);
strbuf->chars[strbuf->length++] = c;
@@ -436,6 +426,16 @@ uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c)
return strbuf->length;
}
static bool strbufCharsLeft(uint32_t i, const void* strbuf)
{
return i < ((const FFstrbuf*) strbuf)->length;
}
static bool strbufCharsLeftS(uint32_t i, const void* str)
{
return ((const char*) str)[i] != '\0';
}
static uint32_t strbufNextIndex(const FFstrbuf* strbuf, uint32_t start, const char* chars, const void* container, bool(*charsLeft)(uint32_t, const void*))
{
for(uint32_t i = start; i < strbuf->length; i++)
@@ -514,12 +514,12 @@ void ffStrbufSubstrBefore(FFstrbuf* strbuf, uint32_t index)
strbuf->chars[strbuf->length] = '\0';
}
void ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, const char c)
void ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, char c)
{
ffStrbufSubstrBefore(strbuf, ffStrbufFirstIndexC(strbuf, c));
}
void ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, const char c)
void ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, char c)
{
ffStrbufSubstrBefore(strbuf, ffStrbufLastIndexC(strbuf, c));
}
@@ -537,14 +537,21 @@ void ffStrbufSubstrAfter(FFstrbuf* strbuf, uint32_t index)
strbuf->chars[strbuf->length] = '\0';
}
void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, const char c)
void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, char c)
{
uint32_t index = ffStrbufFirstIndexC(strbuf, c);
if(index < strbuf->length)
ffStrbufSubstrAfter(strbuf, index);
}
void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, const char c)
void ffStrbufSubstrAfterFirstS(FFstrbuf* strbuf, const char* str)
{
uint32_t index = ffStrbufFirstIndexS(strbuf, str) + (uint32_t) strlen(str);
if(index < strbuf->length)
ffStrbufSubstrAfter(strbuf, index);
}
void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c)
{
uint32_t index = ffStrbufLastIndexC(strbuf, c);
if(index < strbuf->length)
src/util/FFstrbuf.h
+10 -8
View File
@@ -23,11 +23,11 @@ void ffStrbufInit(FFstrbuf* strbuf);
void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src);
void ffStrbufInitS(FFstrbuf* strbuf, const char* value);
void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* value);
void ffStrbufInitC(FFstrbuf* strbuf, const char c);
void ffStrbufInitC(FFstrbuf* strbuf, char c);
void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate);
void ffStrbufInitAS(FFstrbuf* strbuf, uint32_t allocate, const char* value);
void ffStrbufInitANS(FFstrbuf* strbuf, uint32_t allocate, uint32_t length, const char* value);
void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, const char c);
void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, char c);
void ffStrbufInitF(FFstrbuf* strbuf, const char* format, ...);
void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments);
@@ -41,7 +41,7 @@ void ffStrbufClear(FFstrbuf* strbuf);
void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
void ffStrbufSetS(FFstrbuf* strbuf, const char* value);
void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value);
void ffStrbufSetC(FFstrbuf* strbuf, const char c);
void ffStrbufSetC(FFstrbuf* strbuf, char c);
void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...);
void ffStrbufSetVF(FFstrbuf* strbuf, const char* format, va_list arguments);
@@ -51,7 +51,7 @@ void ffStrbufAppendSExcludingC(FFstrbuf* strbuf, const char* value, char exclude
void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude);
void ffStrbufAppendS(FFstrbuf* strbuf, const char* value);
void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value);
void ffStrbufAppendC(FFstrbuf* strbuf, const char c);
void ffStrbufAppendC(FFstrbuf* strbuf, char c);
void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...);
void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments);
@@ -83,14 +83,16 @@ uint32_t ffStrbufFirstIndex(const FFstrbuf* strbuf, const FFstrbuf* searched);
uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str);
uint32_t ffStrbufPreviousIndexC(const FFstrbuf* strbuf, uint32_t start, char c);
uint32_t ffStrbufLastIndexC(const FFstrbuf* strbuf, char c);
void ffStrbufSubstrBefore(FFstrbuf* strbuf, uint32_t index);
void ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, const char c);
void ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, const char c);
void ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, char c);
void ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, char c);
void ffStrbufSubstrAfter(FFstrbuf* strbuf, uint32_t index);
void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, const char c);
void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, const char c);
void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, char c);
void ffStrbufSubstrAfterFirstS(FFstrbuf* strbuf, const char* str);
void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c);
bool ffStrbufStartsWith(const FFstrbuf* strbuf, const FFstrbuf* start);
bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start);