refactor: use the term unmount instead of dismount #1477
Conversation
This change updates the term DISMOUNT in constants to UNMOUNT. Other occurrences (e.g. variable names) are left alone for now. Additionally, the editor fixed a bunch of whitespace errors automatically, thus a diff might not be as nice to read.
This change updates the GUI text and replaces dismount with 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.
There was a problem hiding this comment.
The amount of white space changes is too much. This will cause problems when I will use my editor.
In addition of the issues I reported, can you please find a way to remove these white spaces? I cannot merge the PT with so many of them.
If it proves difficult, maybe a new PR without space changes will be simpler.
Thank you.
| ntStatus = TCFsctlCall (volumeFileObject, FSCTL_UNMOUNT_VOLUME, NULL, 0, NULL, 0); | ||
| Dump ("FSCTL_UNMOUNT_VOLUME returned %X\n", ntStatus); |
There was a problem hiding this comment.
regression: FSCTL_DISMOUNT_VOLUME is a Windows IOCTL that cannot be renamed.
|
|
||
| if (NT_SUCCESS (ntStatus) || ntStatus == STATUS_VOLUME_DISMOUNTED) | ||
| if (NT_SUCCESS (ntStatus) || ntStatus == STATUS_VOLUME_UNMOUNTED) |
There was a problem hiding this comment.
STATUS_VOLUME_DISMOUNTED is a Windows error code that cannot be renamed
| @@ -9674,7 +9674,7 @@ HANDLE DismountDrive (wchar_t *devName, wchar_t *devicePath) | |||
|
|
|||
| attempt = UNMOUNT_MAX_AUTO_RETRIES; | |||
|
|
|||
| while (!(bResult = DeviceIoControl (hVolume, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &dwResult, NULL)) | |||
| while (!(bResult = DeviceIoControl (hVolume, FSCTL_UNMOUNT_VOLUME, NULL, 0, NULL, 0, &dwResult, NULL)) | |||
There was a problem hiding this comment.
FSCTL_DISMOUNT_VOLUME is a Windows IOCTL that cannot be renamed
| @@ -2038,7 +2038,7 @@ static int DismountFileSystem (HWND hwndDlg, HANDLE dev, | |||
|
|
|||
| attempt = UNMOUNT_MAX_AUTO_RETRIES * 10; | |||
|
|
|||
| while (!(bResult = DeviceIoControl (dev, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &dwResult, NULL)) | |||
| while (!(bResult = DeviceIoControl (dev, FSCTL_UNMOUNT_VOLUME, NULL, 0, NULL, 0, &dwResult, NULL)) | |||
There was a problem hiding this comment.
FSCTL_DISMOUNT_VOLUME is a Windows IOCTL that cannot be renamed.
|
Thank you for the review and pointing out my oversight on the WinAPI calls.
Just a suggestion for the future. You might want to use a code formatting tool. The current code is quite inconsistent: there's a mix of tabs and spaces, different coding styles, whitspace at the end of lines and in the beginning of empty lines. I used I am not sure why removing whitespaces at the end of lines or at the beginning of empty lines would mess up your editor, but you are the boss. I'll get on it.
I will have to create a new PR, reverting the whitspace changes one at a time manually would take forever. We can keep this PR open for now or close it. It's up to you. |
|
superseded by #1478 |
This PR has more than 1 commit on purpose and can be squashed during merge. (Or I can squash them as well, even though I like the commits separate in PRs (and not force push in a PR) to make discussion/comments easier to follow. But I will adhere to whatever process this project follows.)
UNMOUNTin constantsunmount(dismountwill still work)This is a rather extensive change in terms of LOC changed. I split it in several commits to make the review a bit easier. Although some whitespace errors were automatically fixed by the editor, for which I am sorry, since it might make a review a bit more tedious.
I haven't changed variable names for now, but can do so upon request. I have noticed that in certain parts of the code the term
unmounthad already been used.