From 5f638a67eda2e235ddad6e36a7611e8c1260b10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 10 Jan 2024 19:03:58 +0800 Subject: [PATCH] Battery: rename manufacturerDate to manufactureDate --- src/detection/battery/battery.h | 2 +- src/detection/battery/battery_android.c | 2 +- src/detection/battery/battery_apple.c | 4 ++-- src/detection/battery/battery_bsd.c | 2 +- src/detection/battery/battery_linux.c | 4 ++-- src/detection/battery/battery_windows.c | 12 ++++++------ src/modules/battery/battery.c | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/detection/battery/battery.h b/src/detection/battery/battery.h index 91ca8d37b..2f4c8e3f1 100644 --- a/src/detection/battery/battery.h +++ b/src/detection/battery/battery.h @@ -7,7 +7,7 @@ typedef struct FFBatteryResult { FFstrbuf manufacturer; - FFstrbuf manufacturerDate; + FFstrbuf manufactureDate; FFstrbuf modelName; FFstrbuf technology; FFstrbuf status; diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index b3b08dee1..8939625cf 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -40,7 +40,7 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results) ffStrbufInit(&battery->modelName); ffStrbufInit(&battery->status); ffStrbufInit(&battery->technology); - ffStrbufInit(&battery->manufacturerDate); + ffStrbufInit(&battery->manufactureDate); battery->capacity = yyjson_get_num(yyjson_obj_get(root, "percentage")); ffStrbufAppendS(&battery->status, yyjson_get_str(yyjson_obj_get(root, "status"))); diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c index c237389db..8aafed206 100644 --- a/src/detection/battery/battery_apple.c +++ b/src/detection/battery/battery_apple.c @@ -29,7 +29,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results) ffStrbufInit(&battery->serial); ffStrbufInit(&battery->technology); ffStrbufInit(&battery->status); - ffStrbufInit(&battery->manufacturerDate); + ffStrbufInit(&battery->manufactureDate); battery->capacity = 0.0/0.0; int currentCapacity, maxCapacity; @@ -78,7 +78,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results) int year = (manufactureDate[0] - '0') * 10 + (manufactureDate[1] - '0') + 2000 - 8; int month = (manufactureDate[2] - '0') * 10 + (manufactureDate[3] - '0'); int day = (manufactureDate[4] - '0') * 10 + (manufactureDate[3] - '5'); - ffStrbufSetF(&battery->manufacturerDate, "%.4d-%.2d-%.2d", year, month, day); + ffStrbufSetF(&battery->manufactureDate, "%.4d-%.2d-%.2d", year, month, day); } } diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c index ff6367547..4376e6e75 100644 --- a/src/detection/battery/battery_bsd.c +++ b/src/detection/battery/battery_bsd.c @@ -40,7 +40,7 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r ffStrbufInit(&battery->status); ffStrbufInit(&battery->technology); ffStrbufInit(&battery->serial); - ffStrbufInit(&battery->manufacturerDate); + ffStrbufInit(&battery->manufactureDate); battery->capacity = battio.battinfo.cap; if(battio.battinfo.state == ACPI_BATT_STAT_INVALID) diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index 605ac2ad0..085e4a892 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -83,7 +83,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option result->cycleCount = cycleCount < 0 || cycleCount > UINT32_MAX ? 0 : (uint32_t) cycleCount; } - ffStrbufInit(&result->manufacturerDate); + ffStrbufInit(&result->manufactureDate); ffStrbufAppendS(dir, "/manufacture_year"); available = ffReadFileBuffer(dir->chars, &tmpBuffer); ffStrbufSubstrBefore(dir, dirLength); @@ -108,7 +108,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option int day = (int) ffStrbufToSInt(&tmpBuffer, 0); if (day > 0) { - ffStrbufSetF(&result->manufacturerDate, "%.4d-%.2d-%.2d", year, month, day); + ffStrbufSetF(&result->manufactureDate, "%.4d-%.2d-%.2d", year, month, day); } } } diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index 4866f49cd..4e1a44db4 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -107,11 +107,11 @@ static const char* detectWithSetupApi(FFBatteryOptions* options, FFlist* results } { - ffStrbufInit(&battery->manufacturerDate); + ffStrbufInit(&battery->manufactureDate); bqi.InformationLevel = BatteryManufactureDate; BATTERY_MANUFACTURE_DATE date; if(DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &date, sizeof(date), &dwOut, NULL)) - ffStrbufSetF(&battery->manufacturerDate, "%.4d-%.2d-%.2d", date.Year + 1900, date.Month, date.Day); + ffStrbufSetF(&battery->manufactureDate, "%.4d-%.2d-%.2d", date.Year + 1900, date.Month, date.Day); } { @@ -198,15 +198,15 @@ const char* detectBySmbios(FFBatteryResult* battery) if (data->ManufactureDate) { - ffStrbufSetStatic(&battery->manufacturerDate, ffSmbiosLocateString(strings, data->ManufactureDate)); - ffCleanUpSmbiosValue(&battery->manufacturerDate); + ffStrbufSetStatic(&battery->manufactureDate, ffSmbiosLocateString(strings, data->ManufactureDate)); + ffCleanUpSmbiosValue(&battery->manufactureDate); } else if (data->Header.Length > offsetof(FFSmbiosPortableBattery, SbdsManufactureDate)) { uint16_t day = data->SbdsManufactureDate & 0b11111; uint16_t month = (data->SbdsManufactureDate >> 5) & 0b1111; uint16_t year = (data->SbdsManufactureDate >> 9) + 1800; - ffStrbufSetF(&battery->manufacturerDate, "%.4d-%.2d-%.2d", year, month, day); + ffStrbufSetF(&battery->manufactureDate, "%.4d-%.2d-%.2d", year, month, day); } switch (data->DeviceChemistry) @@ -242,7 +242,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF FFBatteryResult* battery = (FFBatteryResult*)ffListAdd(results); ffStrbufInit(&battery->modelName); ffStrbufInit(&battery->manufacturer); - ffStrbufInit(&battery->manufacturerDate); + ffStrbufInit(&battery->manufactureDate); ffStrbufInit(&battery->technology); ffStrbufInit(&battery->status); ffStrbufInit(&battery->serial); diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 3fad65c54..cefe6166a 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -72,7 +72,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin {FF_FORMAT_ARG_TYPE_DOUBLE, &result->temperature}, {FF_FORMAT_ARG_TYPE_UINT, &result->cycleCount}, {FF_FORMAT_ARG_TYPE_STRBUF, &result->serial}, - {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturerDate}, + {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufactureDate}, }); } } @@ -99,7 +99,7 @@ void ffPrintBattery(FFBatteryOptions* options) ffStrbufDestroy(&result->technology); ffStrbufDestroy(&result->status); ffStrbufDestroy(&result->serial); - ffStrbufDestroy(&result->manufacturerDate); + ffStrbufDestroy(&result->manufactureDate); } if(results.length == 0) ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "No batteries found"); @@ -195,7 +195,7 @@ void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr); yyjson_mut_obj_add_real(doc, obj, "capacity", battery->capacity); yyjson_mut_obj_add_strbuf(doc, obj, "manufacturer", &battery->manufacturer); - yyjson_mut_obj_add_strbuf(doc, obj, "manufacturerDate", &battery->manufacturerDate); + yyjson_mut_obj_add_strbuf(doc, obj, "manufactureDate", &battery->manufactureDate); yyjson_mut_obj_add_strbuf(doc, obj, "modelName", &battery->modelName); yyjson_mut_obj_add_strbuf(doc, obj, "status", &battery->status); yyjson_mut_obj_add_strbuf(doc, obj, "technology", &battery->technology); @@ -207,7 +207,7 @@ void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc, FF_LIST_FOR_EACH(FFBatteryResult, battery, results) { ffStrbufDestroy(&battery->manufacturer); - ffStrbufDestroy(&battery->manufacturerDate); + ffStrbufDestroy(&battery->manufactureDate); ffStrbufDestroy(&battery->modelName); ffStrbufDestroy(&battery->technology); ffStrbufDestroy(&battery->status);