Skip to content
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.

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

Reformat M_check_autoarg to match our coding style #2121

Closed
wants to merge 2 commits into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Dec 20, 2016

Checklist
  • CLA is signed
Description of change

@levitte levitte added branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch 1.1.0 branch: master Merge to master branch labels Dec 20, 2016
} \
}
if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \
size_t pksize = (size_t)EVP_PKEY_size(ctx->pkey); \
Copy link
Contributor

Choose a reason for hiding this comment

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

blank line after decls?

Copy link
Member Author

Choose a reason for hiding this comment

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

Will do

if (pksize == 0) { \
EVPerr(err, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \
return 0; \
} else if (!arg) { \
Copy link
Contributor

Choose a reason for hiding this comment

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

remove the else after return. since this is all inside an if() statement, it's still one statement.
and in the else-if below.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, good point.

@levitte
Copy link
Member Author

levitte commented Dec 20, 2016

I think I've fixed what you asked, @richsalz . Please re-review.

levitte added a commit that referenced this pull request Dec 20, 2016
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #2121)
levitte added a commit that referenced this pull request Dec 20, 2016
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #2121)
(cherry picked from commit 2629440)
levitte added a commit that referenced this pull request Dec 20, 2016
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #2121)
(cherry picked from commit 2629440)
@levitte
Copy link
Member Author

levitte commented Dec 20, 2016

Merged. Thanks

@levitte levitte closed this Dec 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch: master Merge to master branch branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants