diff options
| author | Helmut K. C. Tessarek <tessarek@evermeet.cx> | 2025-01-31 23:18:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-31 23:18:26 +0100 |
| commit | 498dff9013d18e5978ab77c14ea2b2d0229603a4 (patch) | |
| tree | 7f172f9c2945691ac9b1fb08f963a2263fd6942f /src/Common/Format.c | |
| parent | c71fa14dc09fd7f31282f6ce4fdf3db547b9b827 (diff) | |
| download | VeraCrypt-498dff9013d18e5978ab77c14ea2b2d0229603a4.tar.gz VeraCrypt-498dff9013d18e5978ab77c14ea2b2d0229603a4.zip | |
* refactor: use UNMOUNT instead of DISMOUNT in code
This change updates the term DISMOUNT in constants to UNMOUNT.
Other occurrences (e.g. variable names) are left alone for now.
* refactor(ui): use unmount instead of dismount
This change updates the GUI text and replaces dismount with unmount.
* docs: update term dismount -> unmount
* refactor(cmdline): add unmount
This change adds an argument 'unmount' for command line usage, while
trying to deprecate the old disnount argument.
The current dismount argument/flag will still work to not introduce
a breaking change.
* docs: mention that /dismount is deprecated
This change fixes the shorthand version of the argument /unmount
It also adds back the info for /dismount and that it is deprecated.
Diffstat (limited to 'src/Common/Format.c')
| -rw-r--r-- | src/Common/Format.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Common/Format.c b/src/Common/Format.c index 0c0dddd1..ee766d33 100644 --- a/src/Common/Format.c +++ b/src/Common/Format.c @@ -194,7 +194,7 @@ begin_format: { if ((dev = DismountDrive (devName, volParams->volumePath)) == INVALID_HANDLE_VALUE) { - Error ("FORMAT_CANT_DISMOUNT_FILESYS", hwndDlg); + Error ("FORMAT_CANT_UNMOUNT_FILESYS", hwndDlg); nStatus = ERR_DONT_REPORT; goto error; } @@ -332,7 +332,7 @@ begin_format: if (DeviceIoControl (dev, FSCTL_IS_VOLUME_MOUNTED, NULL, 0, NULL, 0, &dwResult, NULL)) { - Error ("FORMAT_CANT_DISMOUNT_FILESYS", hwndDlg); + Error ("FORMAT_CANT_UNMOUNT_FILESYS", hwndDlg); nStatus = ERR_DONT_REPORT; goto error; } @@ -850,7 +850,7 @@ error: if (retCode != 0) { if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent) - MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND); + MessageBoxW (volParams->hwndDlg, GetString ("CANT_UNMOUNT_VOLUME"), lpszTitle, ICON_HAND); if (dataAreaSize <= TC_MAX_FAT_SECTOR_COUNT * FormatSectorSize) { @@ -872,7 +872,7 @@ error: } if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent) - MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND); + MessageBoxW (volParams->hwndDlg, GetString ("CANT_UNMOUNT_VOLUME"), lpszTitle, ICON_HAND); } fv_end: |