diff --git a/src/detection/physicaldisk/physicaldisk.h b/src/detection/physicaldisk/physicaldisk.h index 6e9c27003..15bb7ce51 100644 --- a/src/detection/physicaldisk/physicaldisk.h +++ b/src/detection/physicaldisk/physicaldisk.h @@ -21,7 +21,7 @@ typedef struct FFPhysicalDiskResult FFstrbuf interconnect; FFstrbuf serial; FFstrbuf devPath; - FFstrbuf firmwareRev; + FFstrbuf revision; FFPhysicalDiskType type; uint64_t size; } FFPhysicalDiskResult; diff --git a/src/detection/physicaldisk/physicaldisk_apple.c b/src/detection/physicaldisk/physicaldisk_apple.c index 1ac7390a2..85ffbbd25 100644 --- a/src/detection/physicaldisk/physicaldisk_apple.c +++ b/src/detection/physicaldisk/physicaldisk_apple.c @@ -43,7 +43,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options) FFPhysicalDiskResult* device = (FFPhysicalDiskResult*) ffListAdd(result); ffStrbufInit(&device->serial); - ffStrbufInit(&device->firmwareRev); + ffStrbufInit(&device->revision); ffStrbufInitS(&device->name, deviceName); ffStrbufInit(&device->devPath); ffStrbufInit(&device->interconnect); @@ -80,7 +80,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options) if (deviceCharacteristics) { ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductSerialNumberKey), &device->serial); - ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductRevisionLevelKey), &device->firmwareRev); + ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductRevisionLevelKey), &device->revision); CFStringRef mediumType = (CFStringRef) CFDictionaryGetValue(deviceCharacteristics, CFSTR(kIOPropertyMediumTypeKey)); if (mediumType) diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index 8d8fd8d16..4a3a19227 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -124,10 +124,10 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options) } { - ffStrbufInit(&device->firmwareRev); + ffStrbufInit(&device->revision); snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/firmware_rev", devName); - if (ffReadFileBuffer(pathSysBlock, &device->firmwareRev)) - ffStrbufTrimRightSpace(&device->firmwareRev); + if (ffReadFileBuffer(pathSysBlock, &device->revision)) + ffStrbufTrimRightSpace(&device->revision); } }