Skip to content

Patches from FreeBSD ports - Recast booleans as bool for clarity.#95

Merged
h6w merged 1 commit intophpvirtualbox:developfrom
rozhuk-im:develop
Feb 5, 2018
Merged

Patches from FreeBSD ports - Recast booleans as bool for clarity.#95
h6w merged 1 commit intophpvirtualbox:developfrom
rozhuk-im:develop

Conversation

@rozhuk-im
Copy link
Copy Markdown
Contributor

More patches.
Bool conversions - for php update to 7x
"Clear on suspend" - was in FreeBSD ports

@h6w
Copy link
Copy Markdown
Contributor

h6w commented Feb 1, 2018

Hey. Thanks for the PR. Can you please include a link to where you got the patches, please? Cheers.

@rozhuk-im
Copy link
Copy Markdown
Contributor Author

Should I remove 8d4e71a ? (It in #57 )

@h6w
Copy link
Copy Markdown
Contributor

h6w commented Feb 2, 2018

Yeah. Can you split 8d4e71a into a separate PR? I feel it's muddying the PR request a little and is really a feature request we need to consider separately.

Thanks!

@rozhuk-im
Copy link
Copy Markdown
Contributor Author

8d4e71a is at #57
Anything else?


public function reset()
{
// No password ID in case of decryption and de-/encryption are both handled here.
Copy link
Copy Markdown
Contributor

@h6w h6w Feb 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to be a pedant, but I'm curious about these 4 lines. They aren't simply recasting like the rest of the patch. These lines already exist in changeEncryption() and you're not blanking the vars like I'd expect in reset(). Is it possible that you've misapplied a patch? Can you explain this further?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is from ab70594
I merge together my changes with changes from other authors.
I will remove it.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that patch is patching changeEncryption(), which we have already done. Whereas your patch add these lines to reset(). See above.

@h6w h6w changed the title Patches from FreeBSD ports Patches from FreeBSD ports - Recast booleans as bool for clarity. Feb 5, 2018
@h6w h6w merged commit 788f43e into phpvirtualbox:develop Feb 5, 2018
@h6w
Copy link
Copy Markdown
Contributor

h6w commented Feb 5, 2018

Awesome. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants