return FoundType;
}
-static VOID ScanVolumeBootcode(IN OUT REFIT_VOLUME *Volume, OUT BOOLEAN *Bootable)
+static VOID ScanVolumeBootcode(REFIT_VOLUME *Volume, BOOLEAN *Bootable)
{
EFI_STATUS Status;
UINT8 Buffer[SAMPLE_SIZE];
CheckError(Status, L"while reading boot sector");
#endif
}
-}
+} /* VOID ScanVolumeBootcode() */
// default volume badge icon based on disk kind
static VOID ScanVolumeDefaultIcon(IN OUT REFIT_VOLUME *Volume)
// Return a string representing the input size in IEEE-1541 units.
// The calling function is responsible for freeing the allocated memory.
static CHAR16 *SizeInIEEEUnits(UINT64 SizeInBytes) {
- float SizeInIeee;
- UINTN Index = 0;
+ UINT64 SizeInIeee;
+ UINTN Index = 0, NumPrefixes;
CHAR16 *Units, *Prefixes = L" KMGTPEZ";
CHAR16 *TheValue;
- TheValue = AllocateZeroPool(sizeof(CHAR16) * 80);
+ TheValue = AllocateZeroPool(sizeof(CHAR16) * 256);
if (TheValue != NULL) {
- SizeInIeee = (float) SizeInBytes;
- while ((SizeInIeee > 1024.0) && (Index < (StrLen(Prefixes) - 1))) {
+ NumPrefixes = StrLen(Prefixes);
+ SizeInIeee = SizeInBytes;
+ while ((SizeInIeee > 1024) && (Index < (NumPrefixes - 1))) {
Index++;
- SizeInIeee /= 1024.0;
+ SizeInIeee /= 1024;
} // while
if (Prefixes[Index] == ' ') {
Units = StrDuplicate(L"-byte");
Units = StrDuplicate(L" iB");
Units[1] = Prefixes[Index];
} // if/else
- SPrint(TheValue, 79, L"%d%s", (UINTN) SizeInIeee, Units);
+ SPrint(TheValue, 255, L"%ld%s", SizeInIeee, Units);
} // if
return TheValue;
} // CHAR16 *SizeInSIUnits()
CHAR16 *SISize, *TypeName;
FileSystemInfoPtr = LibFileSystemInfo(Volume->RootDir);
- if (FileSystemInfoPtr != NULL) {
+ if (FileSystemInfoPtr != NULL) { // we have filesystem information (size, label)....
if ((FileSystemInfoPtr->VolumeLabel != NULL) && (StrLen(FileSystemInfoPtr->VolumeLabel) > 0)) {
FoundName = StrDuplicate(FileSystemInfoPtr->VolumeLabel);
}
FoundName = NULL;
} // if rEFInd HFS+ driver suspected
- if (FoundName == NULL) { // filesystem has no name....
+ if (FoundName == NULL) { // filesystem has no name, so use fs type and size
FoundName = AllocateZeroPool(sizeof(CHAR16) * 256);
if (FoundName != NULL) {
SISize = SizeInIEEEUnits(FileSystemInfoPtr->VolumeSize);
FreePool(FileSystemInfoPtr);
- } else {
+ } else { // fs driver not returning info; fall back on our own information....
FoundName = AllocateZeroPool(sizeof(CHAR16) * 256);
if (FoundName != NULL) {
- TypeName = FSTypeName(Volume->FSType); // NOTE: Don't free TypeName; fn returns constant
+ TypeName = FSTypeName(Volume->FSType); // NOTE: Don't free TypeName; function returns constant
if (StrLen(TypeName) > 0)
SPrint(FoundName, 255, L"%s volume", FSTypeName(Volume->FSType));
else
return FoundName;
} // static CHAR16 *GetVolumeName()
-VOID ScanVolume(IN OUT REFIT_VOLUME *Volume)
+VOID ScanVolume(REFIT_VOLUME *Volume)
{
EFI_STATUS Status;
EFI_DEVICE_PATH *DevicePath, *NextDevicePath;
}
}
}
-}
+} /* VOID ScanExtendedPartition() */
VOID ScanVolumes(VOID)
{
MyFreePool(SectorBuffer2);
}
- }
+ } // for
} /* VOID ScanVolumes() */
static VOID UninitVolumes(VOID)
// Merges two strings, creating a new one and returning a pointer to it.
// If AddChar != 0, the specified character is placed between the two original
-// strings (unless the first string is NULL). The original input string
-// *First is de-allocated and replaced by the new merged string.
+// strings (unless the first string is NULL or empty). The original input
+// string *First is de-allocated and replaced by the new merged string.
// This is similar to StrCat, but safer and more flexible because
// MergeStrings allocates memory that's the correct size for the
// new merged string, so it can take a NULL *First and it cleans
Length2 = StrLen(Second);
NewString = AllocatePool(sizeof(CHAR16) * (Length1 + Length2 + 2));
if (NewString != NULL) {
+ if ((*First != NULL) && (StrLen(*First) == 0)) {
+ MyFreePool(*First);
+ *First = NULL;
+ }
NewString[0] = L'\0';
if (*First != NULL) {
StrCat(NewString, *First);
} // VOID EjectMedia()
-// // Return the GUID as a string, suitable for display to the user. Note that the calling
-// // function is responsible for freeing the allocated memory.
-// CHAR16 * GuidAsString(EFI_GUID *GuidData) {
-// CHAR16 *TheString;
-//
-// TheString = AllocateZeroPool(42 * sizeof(CHAR16));
-// if (TheString != 0) {
-// SPrint (TheString, 82, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-// (UINTN)GuidData->Data1, (UINTN)GuidData->Data2, (UINTN)GuidData->Data3,
-// (UINTN)GuidData->Data4[0], (UINTN)GuidData->Data4[1], (UINTN)GuidData->Data4[2],
-// (UINTN)GuidData->Data4[3], (UINTN)GuidData->Data4[4], (UINTN)GuidData->Data4[5],
-// (UINTN)GuidData->Data4[6], (UINTN)GuidData->Data4[7]);
-// }
-// return TheString;
-// } // GuidAsString(EFI_GUID *GuidData)
+// Return the GUID as a string, suitable for display to the user. Note that the calling
+// function is responsible for freeing the allocated memory.
+CHAR16 * GuidAsString(EFI_GUID *GuidData) {
+ CHAR16 *TheString;
+
+ TheString = AllocateZeroPool(42 * sizeof(CHAR16));
+ if (TheString != 0) {
+ SPrint (TheString, 82, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ (UINTN)GuidData->Data1, (UINTN)GuidData->Data2, (UINTN)GuidData->Data3,
+ (UINTN)GuidData->Data4[0], (UINTN)GuidData->Data4[1], (UINTN)GuidData->Data4[2],
+ (UINTN)GuidData->Data4[3], (UINTN)GuidData->Data4[4], (UINTN)GuidData->Data4[5],
+ (UINTN)GuidData->Data4[6], (UINTN)GuidData->Data4[7]);
+ }
+ return TheString;
+} // GuidAsString(EFI_GUID *GuidData)