From 8a14cbae0c3f9bc28ab795c9e0e9c140ba998740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 18 Sep 2023 20:12:33 +0800 Subject: [PATCH] JSON: don't print the non-standand `NaN` --- src/fastfetch.c | 2 +- src/modules/cpu/cpu.c | 5 +---- src/modules/gpu/gpu.c | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/fastfetch.c b/src/fastfetch.c index 94db3e666..6fcef4810 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1274,7 +1274,7 @@ int main(int argc, const char** argv) if (instance.state.resultDoc) { - yyjson_mut_write_fp(stdout, instance.state.resultDoc, YYJSON_WRITE_ALLOW_INF_AND_NAN | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL); + yyjson_mut_write_fp(stdout, instance.state.resultDoc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL); } ffFinish(); diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 1825747e4..644cda9f4 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -157,10 +157,7 @@ void ffGenerateCPUJson(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_mut_va yyjson_mut_obj_add_uint(doc, obj, "coresOnline", cpu.coresOnline); yyjson_mut_obj_add_real(doc, obj, "frequencyMin", cpu.frequencyMin); yyjson_mut_obj_add_real(doc, obj, "frequencyMax", cpu.frequencyMax); - if (cpu.temperature == cpu.temperature) - yyjson_mut_obj_add_real(doc, obj, "temperature", cpu.temperature); - else - yyjson_mut_obj_add_null(doc, obj, "temperature"); + yyjson_mut_obj_add_real(doc, obj, "temperature", cpu.temperature); } ffStrbufDestroy(&cpu.name); diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 4bf6726ad..95a25df3b 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -256,10 +256,7 @@ void ffGenerateGPUJson(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_mut_va else yyjson_mut_obj_add_null(doc, sharedObj, "used"); - if (gpu->temperature == gpu->temperature) - yyjson_mut_obj_add_real(doc, obj, "temperature", gpu->temperature); - else - yyjson_mut_obj_add_null(doc, obj, "temperature"); + yyjson_mut_obj_add_null(doc, obj, "temperature"); const char* type; switch (gpu->type)