From f533767569f4f781836ebdd9c43b1044b923afec Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Fri, 19 Feb 2021 16:38:54 +0100 Subject: [PATCH] removed obsolete ffRead functions --- src/fastfetch.c | 36 +++++------------------------------- src/fastfetch.h | 2 -- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/src/fastfetch.c b/src/fastfetch.c index 02989ea49..84a49734b 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -13,37 +13,6 @@ void ffPrintLogoAndKey(FFstate* state, const char* key) ffPrintKey(state, key); } -uint32_t ffTruncateLastNewline(char* buffer, uint32_t read) -{ - if(read == 0) - return read; - - if(buffer[read - 1] == '\n') - { - buffer[read - 1] = '\0'; - --read; - } - - return read; -} - -uint32_t ffReadFile(const char* fileName, char* buffer, uint32_t bufferSize) -{ - FILE* file = fopen(fileName, "r"); - if(file == NULL) - { - buffer[0] = '\0'; - return 0; - } - - uint32_t read = fread(buffer, sizeof(char), bufferSize, file); - read = ffTruncateLastNewline(buffer, read); - - fclose(file); - - return read; -} - void ffParsePropFile(const char* fileName, const char* regex, char* buffer) { buffer[0] = '\0'; //If an error occures, this is the indicator @@ -202,6 +171,11 @@ int main(int argc, char** argv) strcpy(state.color, argv[i + 1]); ++i; } + else + { + printf("Error: unknown options: %s\n", argv[i]); + return 43; + } } //Start the printing diff --git a/src/fastfetch.h b/src/fastfetch.h index 894777302..7155562fd 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -42,8 +42,6 @@ typedef struct FFstate void ffPrintLogoLine(FFstate* state); void ffPrintKey(FFstate* state, const char* key); void ffPrintLogoAndKey(FFstate* state, const char* key); -uint32_t ffTruncateLastNewline(char* buffer, uint32_t bufferSize); -uint32_t ffReadFile(const char* fileName, char* buffer, uint32_t bufferSize); void ffParsePropFile(const char* file, const char* regex, char* buffer); void ffParsePropFileHome(FFstate* state, const char* relativeFile, const char* regex, char* buffer); void ffPrintGtkPretty(const char* gtk2, const char* gtk3, const char* gtk4);