Skip to content

Simplify checks and returns in ext/xmlwriter #10701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 26, 2023
Merged

Simplify checks and returns in ext/xmlwriter #10701

merged 1 commit into from
Feb 26, 2023

Conversation

nielsdos
Copy link
Member

@nielsdos nielsdos commented Feb 25, 2023 •
edited
Loading

  • The ptr check is redundant because XMLWRITER_FROM_OBJECT will return if ptr is NULL.
  • Use RETURN_BOOL to simplify the return code.

nikic
nikic reviewed Feb 25, 2023
View reviewed changes
ext/xmlwriter/php_xmlwriter.c Outdated

RETURN_FALSE;
RETVAL_BOOL(retval != -1);
Copy link
Member

Choose a reason for hiding this comment

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

RETURN_BOOL please

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated, thanks.

@nielsdos
Simplify checks and returns in ext/xmlwriter
f277b13 
* The ptr check is redundant because XMLWRITER_FROM_OBJECT will return
  if ptr is NULL.
* Use RETURN_BOOL to simplify the return code.
@devnexen devnexen requested a review from Girgias February 26, 2023 08:29
Girgias
Girgias approved these changes Feb 26, 2023
View reviewed changes
Copy link
Member

@Girgias Girgias left a comment

Choose a reason for hiding this comment

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

Jesus that was some convoluted code which was hard to read.
Thanks for the improvement!

@Girgias Girgias merged commit 07fe46f into php:master Feb 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikic nikic nikic left review comments

@Girgias Girgias Girgias approved these changes

Assignees
No one assigned
Labels
Extension: xmlwriter
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nielsdos @nikic @Girgias