Merge /u/aaronbamberger/gptfdisk/ branch master into master

https://sourceforge.net/p/gptfdisk/code/merge-requests/23/
This commit is contained in:
Roderick W. Smith
2021-01-13 14:40:10 +00:00

View File

@@ -307,7 +307,7 @@ int DiskIO::DiskSync(void) {
// Note that seeking beyond the end of the file is NOT detected as a failure! // Note that seeking beyond the end of the file is NOT detected as a failure!
int DiskIO::Seek(uint64_t sector) { int DiskIO::Seek(uint64_t sector) {
int retval = 1; int retval = 1;
off_t seekTo, sought; off64_t seekTo, sought;
// If disk isn't open, try to open it.... // If disk isn't open, try to open it....
if (!isOpen) { if (!isOpen) {
@@ -424,7 +424,7 @@ int DiskIO::Write(void* buffer, int numBytes) {
// return correct values for disk image files. // return correct values for disk image files.
uint64_t DiskIO::DiskSize(int *err) { uint64_t DiskIO::DiskSize(int *err) {
uint64_t sectors = 0; // size in sectors uint64_t sectors = 0; // size in sectors
off_t bytes = 0; // size in bytes off64_t bytes = 0; // size in bytes
struct stat64 st; struct stat64 st;
int platformFound = 0; int platformFound = 0;
#ifdef __sun__ #ifdef __sun__