mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-11-06 13:14:21 +01:00
Global: drop json-c and switch to yyjson
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#include "fastfetch.h"
|
||||
#include "common/printing.h"
|
||||
#include "common/jsonconfig.h"
|
||||
#include "util/textModifier.h"
|
||||
#include "modules/title/title.h"
|
||||
|
||||
@@ -58,19 +58,24 @@ void ffDestroyTitleOptions(FFTitleOptions* options)
|
||||
FF_UNUSED(options);
|
||||
}
|
||||
|
||||
#ifdef FF_HAVE_JSONC
|
||||
void ffParseTitleJsonObject(FFinstance* instance, json_object* module)
|
||||
void ffParseTitleJsonObject(FFinstance* instance, yyjson_val* module)
|
||||
{
|
||||
FFTitleOptions __attribute__((__cleanup__(ffDestroyTitleOptions))) options;
|
||||
ffInitTitleOptions(&options);
|
||||
|
||||
if (module)
|
||||
{
|
||||
json_object_object_foreach(module, key, val)
|
||||
yyjson_val *key_, *val;
|
||||
size_t idx, max;
|
||||
yyjson_obj_foreach(module, idx, max, key_, val)
|
||||
{
|
||||
const char* key = yyjson_get_str(key_);
|
||||
if(strcasecmp(key, "type") == 0)
|
||||
continue;
|
||||
|
||||
if (strcasecmp(key, "fdqn") == 0)
|
||||
{
|
||||
options.fdqn = json_object_get_boolean(val);
|
||||
options.fdqn = yyjson_get_bool(val);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -80,4 +85,3 @@ void ffParseTitleJsonObject(FFinstance* instance, json_object* module)
|
||||
|
||||
ffPrintTitle(instance, &options);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "fastfetch.h"
|
||||
#include "modules/title/option.h"
|
||||
#include <yyjson.h>
|
||||
|
||||
#define FF_TITLE_MODULE_NAME "Title"
|
||||
|
||||
@@ -9,8 +9,4 @@ void ffPrintTitle(FFinstance* instance, FFTitleOptions* options);
|
||||
void ffInitTitleOptions(FFTitleOptions* options);
|
||||
bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value);
|
||||
void ffDestroyTitleOptions(FFTitleOptions* options);
|
||||
|
||||
#ifdef FF_HAVE_JSONC
|
||||
#include "common/jsonconfig.h"
|
||||
void ffParseTitleJsonObject(FFinstance* instance, json_object* module);
|
||||
#endif
|
||||
void ffParseTitleJsonObject(FFinstance* instance, yyjson_val* module);
|
||||
|
||||
Reference in New Issue
Block a user