Refactor: move os detection to own header

This commit is contained in:
Linus Dierheimer
2022-07-26 17:33:51 +02:00
parent 000bd37f1d
commit 7a15dee2be
6 changed files with 30 additions and 18 deletions
+1
View File
@@ -1,4 +1,5 @@
#include "fastfetch.h"
#include "detection/os.h"
#include "common/properties.h"
#include "common/parsing.h"
+26
View File
@@ -0,0 +1,26 @@
#pragma once
#ifndef FF_INCLUDED_detection_os
#define FF_INCLUDED_detection_os
#include "util/FFstrbuf.h"
typedef struct FFOSResult
{
FFstrbuf systemName;
FFstrbuf name;
FFstrbuf prettyName;
FFstrbuf id;
FFstrbuf idLike;
FFstrbuf variant;
FFstrbuf variantID;
FFstrbuf version;
FFstrbuf versionID;
FFstrbuf codename;
FFstrbuf buildID;
FFstrbuf architecture;
} FFOSResult;
const FFOSResult* ffDetectOS(const FFinstance* instance);
#endif
-18
View File
@@ -173,22 +173,6 @@ typedef struct FFinstance
FFstate state;
} FFinstance;
typedef struct FFOSResult
{
FFstrbuf systemName;
FFstrbuf name;
FFstrbuf prettyName;
FFstrbuf id;
FFstrbuf idLike;
FFstrbuf variant;
FFstrbuf variantID;
FFstrbuf version;
FFstrbuf versionID;
FFstrbuf codename;
FFstrbuf buildID;
FFstrbuf architecture;
} FFOSResult;
typedef struct FFQtResult
{
FFstrbuf widgetStyle;
@@ -329,8 +313,6 @@ void ffLogoBuiltinListAutocompletion();
/////////////////////////
// Detection functions //
/////////////////////////
//detection/os.c
const FFOSResult* ffDetectOS(const FFinstance* instance);
//detection/plasma.c
const FFQtResult* ffDetectQt(FFinstance* instance);
+1
View File
@@ -1,6 +1,7 @@
#include "logo.h"
#include "common/io.h"
#include "common/printing.h"
#include "detection/os.h"
#include <ctype.h>
#include <string.h>
+1
View File
@@ -1,5 +1,6 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/os.h"
#include <ctype.h>
+1
View File
@@ -4,6 +4,7 @@
#include "common/printing.h"
#include "common/settings.h"
#include "common/processing.h"
#include "detection/os.h"
#include <stdlib.h>
#include <string.h>