-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
Remove redundant ifdef USE_OPENSSL #3269
Conversation
There's code that reads as follows: #ifdef USE_OPENSSL #ifdef USE_OPENSSL #else Remove the redundant USE_OPENSSL along with #else (it's not possible to reach it anyway).
lib/curl_ntlm_core.c
Outdated
@@ -52,8 +52,6 @@ | |||
|
|||
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) | |||
|
|||
#ifdef USE_OPENSSL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer if the inner USE_OPENSSL define was removed instead since that would keep the indentation. We can then re-indent lines 57-63 one step to the left aligning them with the other SSL backends.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We would also need to re-indent lines from 64 to 75. Is that ok?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No those can stay where they are, as they are correctly indented two spaces in underneath the topmost #ifdef USE_OPENSSL
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that ok?
# include <openssl/md5.h> | ||
# include <openssl/ssl.h> | ||
# include <openssl/rand.h> | ||
# endif |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This last #endif
also needs to be removed.
This is the version of the patch that I proposed: https://gist.github.com/danielgustafsson/ec1ed3552642d7e4657e656feb31dd29 |
The fixed up commit referenced above pushed to master, thanks for your contribution! |
There's code that reads as follows:
#ifdef USE_OPENSSL
#ifdef USE_OPENSSL
#else
Remove the redundant USE_OPENSSL along with #else (it's not possible to reach it anyway).