From c783bb9d9708b99f7a54b7ec7305f44e3a6fbd62 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sun, 21 Mar 2021 17:02:31 +0100 Subject: [PATCH] renamed spacer to spacing --- completions/bash | 2 +- src/common.c | 2 +- src/fastfetch.c | 6 +++--- src/fastfetch.h | 2 +- src/logo.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/completions/bash b/completions/bash index 48cc6579..edec3b59 100644 --- a/completions/bash +++ b/completions/bash @@ -116,7 +116,7 @@ __fastfetch_completion() local FF_OPTIONS_STRING=( "-c" "--color" - "--spacer" + "--spacing" "-s" "--seperator" "-x" diff --git a/src/common.c b/src/common.c index ea10a8dd..9d470cfc 100644 --- a/src/common.c +++ b/src/common.c @@ -22,7 +22,7 @@ void ffInitState(FFstate* state) void ffDefaultConfig(FFconfig* config) { ffStrbufInit(&config->color); - config->logo_spacer = 4; + config->logo_spacing = 4; ffStrbufInitS(&config->seperator, ": "); config->offsetx = 0; config->titleLength = 20; // This is overwritten by ffPrintTitle diff --git a/src/fastfetch.c b/src/fastfetch.c index 652adf4f..cd5241c5 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -45,7 +45,7 @@ static inline void printHelp() " --structure : sets the structure of the fetch. Must be a colon seperated list of keys\n" " --set : hard set the value of an key\n" " -c , --color : sets the color of the keys. Must be a linux console color code (+)\n" - " --spacer : sets the distance between logo and text\n" + " --spacing : sets the distance between logo and text\n" " -s , --seperator : sets the seperator between key and value. Default is a colon with a space\n" " -x , --offsetx : sets the x offset. Can be negative to cut the logo, but no more than logo width.\n" " --show-errors : print occuring errors\n" @@ -247,14 +247,14 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con puts(FASTFETCH_DEFAULT_CONFIG); exit(0); } - else if(strcasecmp(key, "--spacer") == 0) + else if(strcasecmp(key, "--spacing") == 0) { if(value == NULL) { printf("Error: usage: %s \n", key); exit(404); } - if(sscanf(value, "%hd", &instance->config.logo_spacer) != 1) + if(sscanf(value, "%hd", &instance->config.logo_spacing) != 1) { printf("Error: couldn't parse %s to uint16_t\n", value); exit(405); diff --git a/src/fastfetch.h b/src/fastfetch.h index c29ad90c..2acaf3d1 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -34,7 +34,7 @@ typedef struct FFlogo typedef struct FFconfig { FFlogo logo; - uint16_t logo_spacer; + uint16_t logo_spacing; FFstrbuf seperator; int16_t offsetx; FFstrbuf color; diff --git a/src/logo.c b/src/logo.c index d4dd4b9c..78926006 100644 --- a/src/logo.c +++ b/src/logo.c @@ -164,7 +164,7 @@ void ffLoadLogoSet(FFconfig* config, const char* logo) if(strcasecmp(logo, "none") == 0) { loadNoneLogo(&config->logo); - config->logo_spacer = 0; //This is wanted in most cases, so just set it + config->logo_spacing = 0; //This is wanted in most cases, so just set it } else if(strcasecmp(logo, "arch") == 0) { @@ -224,7 +224,7 @@ void ffPrintLogoLine(FFinstance* instance) putchar(' '); } - for(uint16_t i = 0; i < instance->config.logo_spacer; i++) + for(uint16_t i = 0; i < instance->config.logo_spacing; i++) putchar(' '); ++instance->state.current_row;